| commit | 692f27bfd6840f2a8fe5052b266485b935dc7638 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Oct 06 22:17:50 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 06 22:17:50 2020 +0000 |
| tree | ab0aa34ced9ffc35ad5e50ddc525acfe3b47bf2c | |
| parent | a847b667191d7e880262896cf7483145b5bcabc8 [diff] | |
| parent | 0ef3ff31fdaf8206e7fb533589aa063989ce62bb [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 85e07ab8bb -s ours am: 60207dea5d -s ours am: e5176d3141 -s ours am: 0ef3ff31fd -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450086 Change-Id: Ic4ab6b82aa7b75120fbbfe0b96da8fb2f55a0c1c