| commit | 0526419fcf11cd6afc44e54f50eb85543e628764 | [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 | 859b52cfb0ed064aa01f6b77924c85ffdf8fa501 | |
| parent | 8cdf2850528e0b46a23d732be0ca2e2ac8ac0b3b [diff] | |
| parent | 6d6275583a898c31b2f5e99526f0500dd31abb17 [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 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