| commit | ffebb80bd127ecebfc4af02fe481d048d0c9a29c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 21:27:20 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 21:27:20 2020 +0000 |
| tree | fe4891f208a845ad5f37eef670dac3f3ea01f136 | |
| parent | c9783f6b9e01c63639e54e40cbe3783f729930d3 [diff] | |
| parent | 696c43b5a7b39c7b850ea76b3c1e96cc5963a49e [diff] |
[automerger skipped] Merge "Merge Android R" am: 0bbd9a10e5 -s ours am: fcc43c2c03 -s ours am: 9e98556449 -s ours am: e88bfc12fa -s ours am: 696c43b5a7 -s ours am skip reason: Change-Id Ic54c8dcf210e9b375e7fdce6444c7d882a1784d6 with SHA-1 451a36a9a6 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1422365 Change-Id: I64711068c414c6798d4dae79f3e67da125639efe