summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorEtan Cohen <etancohen@google.com>2021-01-29 23:39:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-29 23:39:48 +0000
commitd8a9174f85f2eaddd331e00895e733b08f6cb534 (patch)
tree7902b4c28e29e2a91e7f9b9df9f1c9c848672c25 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6f8a8f06c49de6a25f786122625024ba65f0fb31 (diff)
parent59f5bcf834c6e89e450df5feb92bd2f9a5ebfeb0 (diff)
Merge "Revert "Grant shell permissions for Airplane Mode to Shell to support CTS"" am: ec8ebce98e am: af364469e5 am: 59f5bcf834
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556331 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6752b057e8fd540a88b494a5c5e86a5902b8b147
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions