| commit | 9e985564491244bb08054f45a2392fc6826be6b2 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:29 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:29 2020 +0000 |
| tree | 2f64e10a0e25e11ec4cbec2997ca61757cdce0e5 | |
| parent | 77230bc934f9646030640993fa3f0a0db4c9ca5e [diff] | |
| parent | fcc43c2c035a156e0c549d7496ed878478ce010b [diff] |
[automerger skipped] Merge "Merge Android R" am: 0bbd9a10e5 -s ours am: fcc43c2c03 -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: Ib51fb43f78f31b27bc3b08fc7a3b9327eb2bc98c