summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorMark Chien <markchien@google.com>2020-07-01 10:28:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-01 10:28:38 +0000
commitde6ef23853c05a4ab9210ad2b88fe2c1fc17d168 (patch)
treeedb8abc40ecbf8967360ef361d5a8b85ecd7bd2e /tools/aapt2/java/JavaClassGenerator_test.cpp
parent57bfa33f20dcbe22c279b1ce5a66d9fdea55707e (diff)
parentc20caa573b9b4e0171735ae43c5578a207cab4c8 (diff)
[automerger skipped] Merge "Fix tethering jarjar rule for LocalLog" am: f64be2d725 am: f089dd736e -s ours am: 010a53c408 -s ours am: c20caa573b -s ours
am skip reason: Change-Id I5f070b96f96aaabf7ec8da52a3d3444ed940fb56 with SHA-1 8b8e72a00d is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353287 Change-Id: I7305fa95820376f517c7083def6e5ad4df585148
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions