| commit | 9496063189c0a64d5fee2e56611d80133ecf7696 | [log] [tgz] |
|---|---|---|
| author | Matt Pietal <mpietal@google.com> | Mon Jul 26 18:49:41 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 26 18:49:41 2021 +0000 |
| tree | bdc451bed2842f44939db72e96754b8ab5094353 | |
| parent | ba224c249981a25fc5a64983f0479541aeb71d67 [diff] | |
| parent | 3786bd801ee845d2f9568d20eee188119c49e67f [diff] |
Merge "Fix multiple control providers" into sc-dev am: 0c89ea5d0f am: 3786bd801e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359491 Change-Id: I2929f08d6276fea4c17b9873138c5bd4cfd6d3df