summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorZach Johnson <zachoverflow@google.com>2020-06-23 18:58:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-23 18:58:22 +0000
commit9629aef0ec67d8b67c9e7741467863decd1d6ffc (patch)
tree93c73b4da8d78cd3f150cb8fc10befb4fb5aaa64 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6fbcbc3003a245860584709da9aa7952256216f4 (diff)
parent61b728abf30250d99ba70096e9f2674b96f5c4b4 (diff)
Merge "CDM: allow system apps with MANAGE_COMPANION_DEVICES to call getAssociations" into rvc-dev am: aeba47ae73 am: 3495918e29 am: 7be5f654ee am: 61b728abf3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953546 Change-Id: I638291f36b0f6e2918872f1be33f71ec3c6f25ba
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions