diff options
author | Zach Johnson <zachoverflow@google.com> | 2020-06-23 18:51:09 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:51:09 +0000 |
commit | 3f6cf40d227a0aa2266d0a7618f5d1a5e5402522 (patch) | |
tree | b69cabfeab22f5b1d0cc5509c96e3bc91bdac591 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e2953a2ae8a015d88e2ba10b258b540a6094d2fd (diff) | |
parent | 3d275c405e68a1cccb4e751b1dc31478ff728527 (diff) |
Merge "CDM: allow system apps with MANAGE_COMPANION_DEVICES to call getAssociations" into rvc-dev am: aeba47ae73 am: 74d36d69e0 am: c251665382 am: 3d275c405e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953546
Change-Id: Ic1d778a23752ebe30674bc0e5eae36547a654a44
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions