| commit | 1e776da5200fd756069e2690d1f91489465daa2f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Sep 02 01:59:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 01:59:15 2020 +0000 |
| tree | 5af63735f8315796709b4cb08aa60b573b73c96f | |
| parent | 3f1a1165d04ed5bd45e993624b4b19a9eeb84cd1 [diff] | |
| parent | 65c647c35db9494c118b9830b8554f4169ec65a9 [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: 65c647c35d -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: I99b7a35f79748c3e70757bb4bd03a9843520adce