diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:55:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:55:10 +0000 |
| commit | 35b401403d17afa8c4aa90c89ad8a97895d3e664 (patch) | |
| tree | 93c73b4da8d78cd3f150cb8fc10befb4fb5aaa64 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e09231537f5ce315dd581ac4cb60cc0642d21e1d (diff) | |
| parent | 17f7bac8ad584ca5995135a6d8bb5cbde5f79268 (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 am: 17f7bac8ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953546
Change-Id: I21db9754316d643c5c418056cd1ef09b8f2205bb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions