commit | fed4ec6ff6d832611461cb7c487c8ae3adafb1fa | [log] [tgz] |
---|---|---|
author | Chiachang Wang <chiachangwang@google.com> | Tue Mar 02 19:22:34 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 02 19:22:34 2021 +0000 |
tree | 2eddf3eaf3c0b4e73dc5dd9ae0c34ad11c523fee | |
parent | c4432db9e942a63960028597720b821b97fd5b7c [diff] | |
parent | 0d7553b30e2f54bd4cb69a9e603fa32e0c7e1248 [diff] |
Merge changes Ifc561b6d,I63137b24 am: 0d7553b30e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605334 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I23cce279f53babac5b90364dd4fc0e55eb382dfa