| commit | e5176d31417e62dd8f91c4903309bed8250f378d | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Oct 06 21:15:41 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 06 21:15:41 2020 +0000 |
| tree | 2e5b211674c5abd0545f0ade3f494fd4d47fc3fb | |
| parent | fb0444e82cc77a254e8fe1cd9f143421b7a8fb18 [diff] | |
| parent | 60207dea5d40442ea6b89a0c3edff8e5060dad8c [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 85e07ab8bb -s ours am: 60207dea5d -s ours am skip reason: Change-Id Iac1f8eafc4d25a5a7c8b6d8eed3f6686705fc2fb with SHA-1 1315f1105e is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450086 Change-Id: If52b26f3960edac6e4849339b2bcb8e4a1b9dad8