diff options
author | Xin Li <delphij@google.com> | 2020-09-01 21:46:55 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-01 21:46:55 +0000 |
commit | 016718d3fd5f87016f0ca4b7ec639254bc83ac38 (patch) | |
tree | 0e353968c34e8c9699663a9b252836b70847c30b /libMpegTPDec | |
parent | 73da86e336c5d79b12a5d54da4448f85bbd8875b (diff) | |
parent | 389ba21eed9dd7b0c0dbc8d7a177b9ddbdce761d (diff) | |
download | fdk-aac-016718d3fd5f87016f0ca4b7ec639254bc83ac38.tar.gz fdk-aac-016718d3fd5f87016f0ca4b7ec639254bc83ac38.tar.bz2 fdk-aac-016718d3fd5f87016f0ca4b7ec639254bc83ac38.zip |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 7a0dde5d5d -s ours am: 389ba21eed -s ours
am skip reason: Change-Id I9bd31724ae68b9a0b3eb4bb5be3782359824aa1f with SHA-1 e0624f4c05 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12470067
Change-Id: I793eca95e3242a6c71ea4ae8e3592a906363c515
Diffstat (limited to 'libMpegTPDec')
0 files changed, 0 insertions, 0 deletions