summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2019-05-20 11:14:09 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-20 11:14:09 -0700
commit9cac69e9fa9316eb8c200bc4c0fad7036f6876ce (patch)
tree53f3995d1c7ba104baf0c37ec9b1e2b839460ec3 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentdd9189e744d116a64cc8047702e8f62c1bc4d001 (diff)
parentcc089266767e89d32bb88a46d02bc59d12731968 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 72ecec0909 -s ours am: e3710a3624 -s ours am: aa34368568 -s ours
am: cc08926676 -s ours am skip reason: subject contains skip directive Change-Id: Icce788a85b0761cd4487db4f3d63b72b682a33c8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions