| commit | 78a23f1bdd06dcb28b8bb7d5b737650c31cc79e7 | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Fri Aug 07 07:37:08 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 07 07:37:08 2020 +0000 |
| tree | ab79a2aae8296cf15a1aa943572e8bb431714e0c | |
| parent | 1b402113fe3a900aab8a361c26976aa147487458 [diff] | |
| parent | 8b9473a80bc966e7f98ccfe9e28954e81bc3c5d5 [diff] |
[automerger skipped] Merge changes I33b70b0a,I1074eedb am: e286c5e1ef am: cbcb46cb87 -s ours am: 26187e2fba -s ours am: 8b9473a80b -s ours am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 deae676127 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725 Change-Id: I8a133f595e5f40a0aec4b831070997c9a0fa4bdc