commit | 66b936d926a0bdce8be1e942f118c01d23cce220 | [log] [tgz] |
---|---|---|
author | Mady Mellor <madym@google.com> | Fri Jul 30 17:16:33 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 30 17:16:33 2021 +0000 |
tree | 75656d8e38604b788c2ab9b8bc0fd454ac210a08 | |
parent | 69d46fa9b752c300ea1eb6d506ec046225bf8fe5 [diff] | |
parent | efc97e3688295d928bac9f76eb5d433623eb8f7f [diff] |
Merge changes Ie7aaec55,I3053cdb6 into sc-v2-dev am: 57a3e448f6 am: efc97e3688 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15421004 Change-Id: I2b90171df59cdbf4514bc4e609f09d98bbabe588