| commit | b4d60515abba8253c085d4cb85c36afcb5ad55da | [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 | d15e178a6690a7b8cb2d57e1f01b269ea2cb9bab | |
| parent | 32f53e1cbb65332cff6d68cf409d0cdf169b3e24 [diff] | |
| parent | a2772cf6400f2e45851014e5b705cad9de0ff5be [diff] |
[automerger skipped] Merge changes I33b70b0a,I1074eedb am: 1fb7241345 am: a2772cf640 -s ours am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 edadfcfae1 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725 Change-Id: I462f911d13e7574a0babd6d661c0b569f0265b58