Skip to content
Commit 61b728ab authored by Zach Johnson's avatar Zach Johnson Committed by Automerger Merge Worker
Browse files

Merge "CDM: allow system apps with MANAGE_COMPANION_DEVICES to call... 

Merge "CDM: allow system apps with MANAGE_COMPANION_DEVICES to call getAssociations" into rvc-dev am: aeba47ae am: 3495918e am: 7be5f654

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953546

Change-Id: Ib60e49fcda4408ae295263a46509ba906d57e30b
parents 6432d408 7be5f654
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment