| commit | abf26332501caf49910bad0cf7771e1d7c9cc5f9 | [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 | a403518813e53be92a90f7aef6d7aca65ca91955 | |
| parent | 70e5893dabd94e8a404f6e701254d8e509ae0b52 [diff] | |
| parent | 51c2f35906580ed6e1447524d22b672e251e1eda [diff] |
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours am: 4467c2f6ec -s ours am: 51c2f35906 -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