commit | 6d6275583a898c31b2f5e99526f0500dd31abb17 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Sep 01 21:46:39 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 01 21:46:39 2020 +0000 |
tree | 994f971a7a14401a01a5f09676637d116e3c0ff8 | |
parent | 4d109e3212ff8ae270c43b2c18e4d5c1413374b3 [diff] | |
parent | e3f8f8aa913a08ddd46c858b46155125ce6f9fb8 [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 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: Icebcb9092d11694141d0d6a0c47c9f8378f5b03a