| commit | 60207dea5d40442ea6b89a0c3edff8e5060dad8c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Oct 06 20:23:54 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 06 20:23:54 2020 +0000 |
| tree | f93daeb98aefa95040903cfa37202291ea1e360d | |
| parent | bb2a513010c9a7b32cffc2ede21697e1f071fb23 [diff] | |
| parent | 85e07ab8bb30fa7aeda8c7e87cef52879c55ab77 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 85e07ab8bb -s ours am skip reason: Change-Id Iac1f8eafc4d25a5a7c8b6d8eed3f6686705fc2fb with SHA-1 0a012afd4a is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450086 Change-Id: I440e9559f0ac14f48c6d672bdf44992f8db8d82f