diff options
author | Zach Johnson <zachoverflow@google.com> | 2020-06-23 18:33:09 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:33:09 +0000 |
commit | 61b728abf30250d99ba70096e9f2674b96f5c4b4 (patch) | |
tree | a34ceda6fdbc602f446666f19dc10876b58599e1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6432d408c975db774c7aa0d05d104cd04ed2dcc8 (diff) | |
parent | 7be5f654ee0cdd4c068af617f9ff9b02ebc452a7 (diff) |
Merge "CDM: allow system apps with MANAGE_COMPANION_DEVICES to call getAssociations" into rvc-dev am: aeba47ae73 am: 3495918e29 am: 7be5f654ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953546
Change-Id: Ib60e49fcda4408ae295263a46509ba906d57e30b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions