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