diff options
| author | Zach Johnson <zachoverflow@google.com> | 2020-06-23 18:10:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:10:08 +0000 |
| commit | 54338d3756c0622b5e7eadcfdd6091094fac7867 (patch) | |
| tree | 95076158c31e35f25696fd96ce26a131fe318456 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6b997e715a006519276a639cdadb5b1fbcc15355 (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: Iff40b8c27719f462e1eec333046a207a5ecd4895
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions