summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-07-23 23:38:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-23 23:38:49 +0000
commitee5b713dcbf2cf642b96441e7238952b72ccc5fa (patch)
tree2bc5ac56652f4154931c0919c1a9480902451bb4 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent7c780fa485482adb7d527d33160432bb8548d24f (diff)
parentb511e22cf057902570931bc3186843b64ca9ca28 (diff)
[automerger skipped] Merge "Adding LOADER_USAGE_STATS permission to shell" am: a5a04bbb4e am: e769f7bf7d -s ours am: ce6987d263 -s ours am: b511e22cf0 -s ours
am skip reason: Change-Id I4f146337429679edddba698aa88bb9b2cb883ab9 with SHA-1 a2b2226d6b is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326492 Change-Id: I106ff3c8e199907544e7c8b6371abb1a40bdb32d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions