| commit | 5c7ec98fde92c77dcd7a29dde1b8c9c919aeaf41 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Sep 01 22:09:55 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 01 22:09:55 2020 +0000 |
| tree | 90d8061def99099e464e6d125efd08f3bc13f246 | |
| parent | 660375a29d0b9ef56945ed4c36228527efdba849 [diff] | |
| parent | 5484d174a4f9d28404bcf8a4b048f3e6dc9d7d6c [diff] |
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours am: eea8d0591b -s ours am: 5484d174a4 -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: Ibf18c18a55f917c4bbdccd1e088a5ec808573ea7