| commit | 2e4306e954af1d681d19ad2cfc55f39dd4335159 | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Thu Jan 28 00:43:02 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 28 00:43:02 2021 +0000 |
| tree | 3bc74f549f7d07bab7908d020a12b0095f3eae15 | |
| parent | 97b65d577c7b846aa21d51fb507863bd6f4f4c5b [diff] | |
| parent | 15c3e45a8fe9d6fc36da3e8ac29fe527a7fe0022 [diff] |
Merge changes I45054e68,I6f301314 am: 2befe56df0 am: 17cf7a6465 am: 15c3e45a8f Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555542 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5511b2fcdce3c2a58bab9b6c7a114d775e13883d