diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:31:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-23 18:31:56 +0000 |
| commit | 17f7bac8ad584ca5995135a6d8bb5cbde5f79268 (patch) | |
| tree | a34ceda6fdbc602f446666f19dc10876b58599e1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | cfd11c56a9eb39f4dc8773edf777aca7a0eea358 (diff) | |
| parent | ce9fcbc8954ccc5c3a0004b15a132f5d5a0bea25 (diff) | |
Merge "Merge "CDM: allow system apps with MANAGE_COMPANION_DEVICES to call getAssociations" into rvc-dev am: aeba47ae73 am: 3495918e29 am: 54338d3756" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions