commit | 74d36d69e01abc0b35dc603a088a64a1527afcfd | [log] [tgz] |
---|---|---|
author | Zach Johnson <zachoverflow@google.com> | Tue Jun 23 17:52:12 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 23 17:52:12 2020 +0000 |
tree | 5a5319c5976931969480493ef8c5428994482233 | |
parent | 0d5c10c25d9bf9436a3650ae1d38fb589469a723 [diff] | |
parent | aeba47ae7306a89665a01939a61961394c612dab [diff] |
Merge "CDM: allow system apps with MANAGE_COMPANION_DEVICES to call getAssociations" into rvc-dev am: aeba47ae73 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953546 Change-Id: I696517ec6099d5e45463a1d0095e9edff212928e