| commit | 31bcd7270e78ec36a48a3c097b4c499ec2513a0c | [log] [tgz] |
|---|---|---|
| author | Matt Pietal <mpietal@google.com> | Thu Jul 22 18:26:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 22 18:26:42 2021 +0000 |
| tree | 9f86bc99666956e9b9ce7fe6102a80928e2c4bd7 | |
| parent | 4952ce2d933bd54a0094604f6dd7f9a4411c93d1 [diff] | |
| parent | ab7ebe718a41a436c0458ce0fbb61e8380617039 [diff] |
Merge "Fix multiple control providers" into sc-dev am: 0c89ea5d0f am: ab7ebe718a Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359491 Change-Id: I012845906556290dc7310db8ceff35be5954f4b0