| commit | f130c6ddf08b54cc824c6b71e8a268fc3ec98cce | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu May 13 17:01:54 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 13 17:01:54 2021 +0000 |
| tree | 0a9da2b0464f55e417cedeb4ce04aedbd97c2e7d | |
| parent | 499925d594fa160b531708daa1098675803c3324 [diff] | |
| parent | 8ff101f5406e0ea8c806087ad70c51be927c25da [diff] |
[automerger skipped] Merge changes Ia5bc896c,I0c9406f4,I3108ee94 am: dff00cd42b am: e85055d0a8 am: 8ff101f540 -s ours am skip reason: skipped by user lorenzo Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705389 Change-Id: Icc5d80d32409711650384577150e9d309788b001