| commit | bd8c027fd6d483c1f302f5e135543f56a57fb0cb | [log] [tgz] |
|---|---|---|
| author | Ned Burns <pixel@google.com> | Fri Aug 06 23:45:26 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 06 23:45:26 2021 +0000 |
| tree | 1c3fad1bf6873eabe482f5ed8397c5cce539e723 | |
| parent | 4881690d203e58f428c5f4fd5dd36f62976ea032 [diff] | |
| parent | c3d7c82b545c20fe72ee3043163f625edafc17e8 [diff] |
Merge changes I8ca03eb4,Iccd924ca into sc-dev am: f2446930e0 am: c3d7c82b54 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15475533 Change-Id: Ifb690a447077569fae04950cc7236d1deecdeef3