commit | 64854fb67af5e9702e556d9f44d4477b89d155b1 | [log] [tgz] |
---|---|---|
author | Matt Pietal <mpietal@google.com> | Wed Jul 28 14:39:27 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 28 14:39:27 2021 +0000 |
tree | ab43ecf473f67d563927ecd994048f141e22983a | |
parent | d0f04034f3ee1abcdd447c46f802b03e36ff34f3 [diff] | |
parent | 0c89ea5d0f69932055c9697cacead39544df29c3 [diff] |
Merge "Fix multiple control providers" into sc-dev am: 0c89ea5d0f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359491 Change-Id: Icebbf267a8faa488dbd0fb6b0d994a669fe87627