| commit | c8968846bdaf1202c882a36c343e19b3a9925530 | [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 | 513a65065ae5ef2fa8e03d92ddf99452c0da2e0c | |
| parent | 68bec471f7fe768e89b99a19313ac05b2e7a22d3 [diff] | |
| parent | 3d8f2da2d7129d4e71fa92a1fd7ece6304eca6da [diff] |
[automerger skipped] Merge changes Ia5bc896c,I0c9406f4,I3108ee94 am: de0eb903cb am: 836ffee197 am: 3d8f2da2d7 -s ours am skip reason: skipped by user lorenzo Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705389 Change-Id: Icc5d80d32409711650384577150e9d309788b001