commit | 748281691345c7e227f23b5a7e5f78089849a4c5 | [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 | 0654f5b9fdcb684df9d17c0ba6ece739517d0c96 | |
parent | add39ee6c2cb3b1b813c0336edb53884feba53a8 [diff] | |
parent | 5c7ec98fde92c77dcd7a29dde1b8c9c919aeaf41 [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: 5c7ec98fde -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