| commit | 8b9473a80bc966e7f98ccfe9e28954e81bc3c5d5 | [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 | 1eab5fa75faeb078061595dc8660e47dc0df965f | |
| parent | c64e1a0e2cb67e82698b624de1f32eb76cbe9e7e [diff] | |
| parent | 26187e2fba58232b720e050a0d9c9254c6ebe810 [diff] |
[automerger skipped] Merge changes I33b70b0a,I1074eedb am: e286c5e1ef am: cbcb46cb87 -s ours am: 26187e2fba -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: I039772ce9b09d2f0f9d07fbf632d3d8efa01630b