| commit | f1ac1eddadfc3c137794f50ec52e06695d1bc4e5 | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Fri Aug 07 07:16:28 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 07 07:16:28 2020 +0000 |
| tree | fd7f7affec11be71600991fa3f09d04ca8c5530d | |
| parent | ce321cccc3fe1829a65b3a0b56a4376f549701ee [diff] | |
| parent | 5ab9ebb883a85d4325afad52f1e66537dd475d3d [diff] |
[automerger skipped] Merge changes I33b70b0a,I1074eedb am: 8818498877 am: 5ab9ebb883 -s ours am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725 Change-Id: I462f911d13e7574a0babd6d661c0b569f0265b58