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