commit | fab908d857523e74dfafb70de45060e23df6b734 | [log] [tgz] |
---|---|---|
author | Cassie Wang <cassiewang@google.com> | Tue Aug 10 19:49:11 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 19:49:11 2021 +0000 |
tree | a4df5873fe64528121f3c38431ceb23903e89677 | |
parent | 063eb19156cf71e4d90c4b8a854cd6e170120c8f [diff] | |
parent | ccbe3eebf13907c3fafdd3e9614c34f0edab433d [diff] |
Merge changes I9ef21efc,Id762ed7b into sc-v2-dev am: 77f1abd1f9 am: ccbe3eebf1 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405168 Change-Id: I53005e72c0a325c48456b190dd92314fc32141ef