| commit | 885f485bc80401b49ec6df5c432cd0222ed4b171 | [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 | 095d8e567776235915aab0b200982303da4f431a | |
| parent | 90146d615073e6db76aa075613f00fbae43af750 [diff] | |
| parent | 0526419fcf11cd6afc44e54f50eb85543e628764 [diff] |
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours am: e3f8f8aa91 -s ours am: 6d6275583a -s ours am: 0526419fcf -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