| commit | e5d8f60389fd8bab0cd73c50d1c7eb247cd8e62c | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Thu Jan 14 01:44:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 14 01:44:55 2021 +0000 |
| tree | 2abd9acc816e5cc28441ef044f9a1318974b7b87 | |
| parent | 8dece034b944234f8f00618779c5d655f0fd4ab4 [diff] | |
| parent | 5bf384cae96a9384248af127b643173e2997c1c1 [diff] |
Merge changes Id0e18bef,Ie2b5f559 am: 5bf384cae9 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531240 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifbdaa08e4e467a950c21f749ea298e1182bb05b0