| commit | 500579cd2b22b8d19a53fb5aa9692b1438375e05 | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Thu Jan 14 04:21:40 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 14 04:21:40 2021 +0000 |
| tree | 2bab38466bb497fe587a9b723a1e6d1c29441754 | |
| parent | 71badc9b5b8877b8d9dd03c1f0b43b0bfa4b7e50 [diff] | |
| parent | e5d8f60389fd8bab0cd73c50d1c7eb247cd8e62c [diff] |
Merge changes Id0e18bef,Ie2b5f559 am: 5bf384cae9 am: e5d8f60389 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531240 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idc61336580ca8b58efad146c5aebfcbbc845e78d