summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-10 18:59:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-10 18:59:52 +0000
commitf44bf57c0bf1c8b2fac5e531a37ced8a9d8e292b (patch)
tree9e70434f71ee76baeae5ef65e553f04aa0214533 /tools/aapt2/java/JavaClassGenerator_test.cpp
parente08205b609e7e186b98252b14d85e98c735bb02d (diff)
parente18c350eec78ba1b7bf709955ebf51394a52edce (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: e18c350eec -s ours
am skip reason: subject contains skip directive Change-Id: If74e128e8b100e43f147e2de73f7227fb2c453fe
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions