| commit | c9674eec2120ff5ad8000263e9dcc2e26662673e | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Thu Apr 22 22:51:01 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 22:51:01 2021 +0000 |
| tree | 750c1df2a91427f45b8bb5eacaf90fc97f199b62 | |
| parent | 46d67749d5c14b25b4c69ed0d1668877b87fa9d8 [diff] | |
| parent | 58deb1cfc1aa2152b4f599b9351f5b2e79d061ab [diff] |
Merge changes I296c1011,I05695607 am: 58deb1cfc1 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682127 Change-Id: I7f7c45e39cb918a94d0c469dedfab4d06491ec38