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