commit | 2fd269494a121722dc37a20e7a591de3de4dce3f | [log] [tgz] |
---|---|---|
author | Tianjie Xu <xunchang@google.com> | Tue Dec 15 00:03:48 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 15 00:03:48 2020 +0000 |
tree | ea2d1b9d9d65f74b583919a82edf11f658759110 | |
parent | 1e02d710bc6aa09c4c2d2d1e347ad5950f904534 [diff] | |
parent | a258be9df529c31e24f42c555199d98681b6710a [diff] |
Merge changes Icf10d577,Ia9d3cae7 am: 6083210d17 am: a258be9df5 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519582 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I12512a441b330e062fe8e8d482a367e719c7d45d