summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorXiangyu/Malcolm Chen <refuhoo@google.com>2019-03-28 11:36:33 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-28 11:36:33 -0700
commit05c1fc115124908a0463b91115d675032c9ad7a4 (patch)
tree10070ec7f261a48470208d4cdff89ddc177a9e5e /tools/aapt2/java/JavaClassGenerator_test.cpp
parent7c49110098ec9e707432cd5b1f6b26c1a154d563 (diff)
parentda63fbc50b04899c6679a2b2c9e3f38a9eed792b (diff)
[automerger skipped] Merge changes from topic "126637721" am: 9763d788ef am: 4b8ef66c0e
am: da63fbc50b -s ours am skip reason: change_id I62e298e7b9bdc82dd44f0c8ae783c623e101b0ef with SHA1 50ba963fdc is in history Change-Id: Ic402cf77fbf6e9b3eaefec25086dc261273ec667
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions