| commit | 8fd8590f92fa689873c427bbe0bd8a28c0edeae9 | [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 | d15e178a6690a7b8cb2d57e1f01b269ea2cb9bab | |
| parent | 4a844bab4c68f508f44f6ffcfe4dac4b423c8ae5 [diff] | |
| parent | b4d60515abba8253c085d4cb85c36afcb5ad55da [diff] |
[automerger skipped] Merge changes I33b70b0a,I1074eedb am: 1fb7241345 am: a2772cf640 -s ours am: b4d60515ab -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: I039772ce9b09d2f0f9d07fbf632d3d8efa01630b