commit | bf6fb53f1460d4cd6339a9c6154ec2f97324de0c | [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 | 1cdf2797ca6930b37cea2f5bcc682ed4d572a7be | |
parent | 83f0491092a1159b29ad31203decf9f1af505ea7 [diff] | |
parent | 60c68b25d98a397054f0877cc89a098e345605fc [diff] |
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours am: 60c68b25d9 -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