| commit | 676422f2392fcebf14dc0d35ed4b2a20040013f3 | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Thu Apr 22 23:12:14 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 23:12:14 2021 +0000 |
| tree | cff8c9c96429cb304518ebd9c2efa85b71f1d99d | |
| parent | 6e1bf17f307100de140ec819ef30f7d4a97b2c67 [diff] | |
| parent | c9674eec2120ff5ad8000263e9dcc2e26662673e [diff] |
Merge changes I296c1011,I05695607 am: 58deb1cfc1 am: c9674eec21 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682127 Change-Id: I8328f17b833c9b5673e5fab258be39e59e159c5f