diff options
author | Xin Li <delphij@google.com> | 2019-06-05 20:38:29 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-05 20:38:29 -0700 |
commit | 22344b4b51b83764ec7811bf35507feb8aa3e417 (patch) | |
tree | fa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98 /MODULE_LICENSE_FRAUNHOFER | |
parent | c8caff8633e31447de6702b17051adb0cf9e9afe (diff) | |
parent | e8095d4d8e7f9bc3735bff68b5d91f92aab1d929 (diff) | |
download | fdk-aac-22344b4b51b83764ec7811bf35507feb8aa3e417.tar.gz fdk-aac-22344b4b51b83764ec7811bf35507feb8aa3e417.tar.bz2 fdk-aac-22344b4b51b83764ec7811bf35507feb8aa3e417.zip |
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master am: 0ef4321d83 -s ours am: 68078adb95
am: e8095d4d8e -s ours
am skip reason: subject contains skip directive
Change-Id: Idc89c0aef321103bb42fbe7297f91155019255e0
Diffstat (limited to 'MODULE_LICENSE_FRAUNHOFER')
0 files changed, 0 insertions, 0 deletions