| commit | 696c43b5a7b39c7b850ea76b3c1e96cc5963a49e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:58:51 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:58:51 2020 +0000 |
| tree | 0f822ade4b9c29f5295be9f18a51cc2ef0d9b9d5 | |
| parent | 85109f953b728cbd50b36c18c48e52ef71f3bb95 [diff] | |
| parent | e88bfc12fa63b5f083d87faa5f40751b3bbfc1c9 [diff] |
[automerger skipped] Merge "Merge Android R" am: 0bbd9a10e5 -s ours am: fcc43c2c03 -s ours am: 9e98556449 -s ours am: e88bfc12fa -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: I3a4a56bbb9ca5b1823319914b94cbbf547f6fd38