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