| commit | a258be9df529c31e24f42c555199d98681b6710a | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Mon Dec 14 23:25:48 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 14 23:25:48 2020 +0000 |
| tree | 978ec4d9b34f70ff48a223bc86f390e463ef0640 | |
| parent | 1f9067267a6421f0dd972118813a397feebf4599 [diff] | |
| parent | 6083210d173dd9b0402e207e3f27ea24cc2bc31c [diff] |
Merge changes Icf10d577,Ia9d3cae7 am: 6083210d17 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519582 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia8d09a821357e06539bc2c71ad8c22587dac0176