| commit | 65c647c35db9494c118b9830b8554f4169ec65a9 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Sep 01 22:09:48 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 01 22:09:48 2020 +0000 |
| tree | 8750af6324624c5ae407e45f3de477f39b415525 | |
| parent | 45d6dc964d0fbcfde10dcef07fda68a84b6a2516 [diff] | |
| parent | e12b63aff36f973cdea38a2d391182ba24249eb8 [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: e12b63aff3 -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: I8ed8d6c9b0a600cb16d26c0db3bcb795659e1166