summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2019-05-20 11:13:25 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-20 11:13:25 -0700
commitdd9189e744d116a64cc8047702e8f62c1bc4d001 (patch)
tree53f3995d1c7ba104baf0c37ec9b1e2b839460ec3 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentdb596465f17150eeb4af14c7371f50d3415fa6fb (diff)
parenta3667ea0ddd12e861d424ae659bdd9b4e28087e5 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d0461a536c -s ours am: bd7296c448 -s ours
am: a3667ea0dd -s ours am skip reason: subject contains skip directive Change-Id: Ide7bee688bac136891c75ba4d267dc4b1aa10a95
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions