aboutsummaryrefslogtreecommitdiffstats
path: root/libDRCdec
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-05 11:50:22 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-05 11:50:22 -0700
commit35b1ada3b42528978ae970d1835e1847c2634c7a (patch)
treefa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98 /libDRCdec
parenta3f72d9e441de1fb70afc76fdbc072d8e45a10c8 (diff)
parent5d3d55e2c7b3445b09716685ef81937a481990cd (diff)
downloadfdk-aac-35b1ada3b42528978ae970d1835e1847c2634c7a.tar.gz
fdk-aac-35b1ada3b42528978ae970d1835e1847c2634c7a.tar.bz2
fdk-aac-35b1ada3b42528978ae970d1835e1847c2634c7a.zip
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d929f68a05 -s ours
am: 5d3d55e2c7 Change-Id: I0ada3904a4004089fdfdb43966288c019cf58d8c
Diffstat (limited to 'libDRCdec')
0 files changed, 0 insertions, 0 deletions