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