| commit | 81ef477e975879e600e0304cddc91bfdc5a9d920 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Sep 02 01:59:21 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 01:59:21 2020 +0000 |
| tree | b24d06c21b2e5e6efb5fbfcba0b3164cdbb3d047 | |
| parent | c77883a597355bfbb4c04308e6a5ff8dcc46bb86 [diff] | |
| parent | b917ae3610d7a679423e77e7ea556517845fe3f7 [diff] |
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours am: 74965907fe -s ours am: 3a07719559 -s ours am: b917ae3610 -s ours am skip reason: Change-Id I3d92a6de21a938f6b352ec26dc23420c0fe02b27 with SHA-1 d2d3a20624 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12484850 Change-Id: I73509239c8e21916b1d275bb9f04e3d971fde73d