diff options
author | Bill Yi <byi@google.com> | 2020-11-05 04:57:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-05 04:57:01 +0000 |
commit | 54e05b6496cab4a9d23f6077e3e8185175527a9a (patch) | |
tree | 8da47c5f9b0f9ddce2910199b3025227178e16c0 /libAACenc/src | |
parent | ac5e8684adc537a849567d37b20213bfa253cb14 (diff) | |
parent | 700bc783fb57d88d8aaa74ea84778b0f1c6be128 (diff) | |
download | fdk-aac-54e05b6496cab4a9d23f6077e3e8185175527a9a.tar.gz fdk-aac-54e05b6496cab4a9d23f6077e3e8185175527a9a.tar.bz2 fdk-aac-54e05b6496cab4a9d23f6077e3e8185175527a9a.zip |
[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: 5b4265a02a am: 8b4e287ff6 -s ours am: 51ff3aa199 -s ours am: 700bc783fb -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978
Change-Id: I77b49175f9c8523aa87b1aa4b99a106bdaef25b6
Diffstat (limited to 'libAACenc/src')
0 files changed, 0 insertions, 0 deletions