| commit | e12b63aff36f973cdea38a2d391182ba24249eb8 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Sep 01 21:46:32 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 01 21:46:32 2020 +0000 |
| tree | 46ce02739a2899d0c4c1c356ec955d7242ea753b | |
| parent | 37e9654973cf0458a30805ef2180265e356e1987 [diff] | |
| parent | b1cfe1266fd543b347107356a57c70f58ceb005e [diff] |
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 4ffca8764b -s ours am: b1cfe1266f -s ours am skip reason: Change-Id Ie94127c1e981cb18671d5137ba0d39355d1353da with SHA-1 924eccfd6f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12485043 Change-Id: I0816a5eaa48c495e7146fa38fa030169c17b1062