| commit | 2ea424eac63dca80b34e71b1c31a69f27e141566 | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Fri Aug 07 07:45:45 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 07 07:45:45 2020 +0000 |
| tree | 7c64c67154fd0f680321c3c202cfe79931884617 | |
| parent | 6af5edccf24e9bf9cfc29a31ea0ea11046495d58 [diff] | |
| parent | 78a23f1bdd06dcb28b8bb7d5b737650c31cc79e7 [diff] |
[automerger skipped] Merge changes I33b70b0a,I1074eedb am: e286c5e1ef am: cbcb46cb87 -s ours am: 26187e2fba -s ours am: 8b9473a80b -s ours am: 78a23f1bdd -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: Ice038957c1a18e1a978362309adeef798b6223bf