| commit | ab7ebe718a41a436c0458ce0fbb61e8380617039 | [log] [tgz] |
|---|---|---|
| author | Matt Pietal <mpietal@google.com> | Thu Jul 22 17:59:03 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 22 17:59:03 2021 +0000 |
| tree | f4fe8e1c5103a12b028ae66d4c4b4079fda5909e | |
| parent | 15bda2adbb2fb8cb5fbb988086cd1ae3415aab23 [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: I8eb0329497dc6f805a4fee22dafab25517d31a6d