| commit | 371cab24540eefbfa4ed2aa29cfb9a4a2217e4a9 | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Fri Aug 07 07:26:54 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 07 07:26:54 2020 +0000 |
| tree | fd7f7affec11be71600991fa3f09d04ca8c5530d | |
| parent | 5a3b172d0b27d144ee6e0f69ee5bfce56d1bb0a2 [diff] | |
| parent | f1ac1eddadfc3c137794f50ec52e06695d1bc4e5 [diff] |
[automerger skipped] Merge changes I33b70b0a,I1074eedb am: 8818498877 am: 5ab9ebb883 -s ours am: f1ac1eddad -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: I039772ce9b09d2f0f9d07fbf632d3d8efa01630b