summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorHansong Zhang <hsz@google.com>2018-03-28 03:57:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-28 03:57:00 +0000
commit801143995a1ad87f53cae23f477cc98832851498 (patch)
treee3796efe8168955b59ac67c5cc2b81935bae1b5c /tools/aapt2/java/JavaClassGenerator_test.cpp
parent4ea96198fa6057c3322ef2ce38399df785a8872d (diff)
parent335ae79ca52c1d2d84cb4f6dd47971b3dcc45633 (diff)
[automerger skipped] Merge changes I70eafe03,Ia44e16c5 am: b52f49153c am: 464d62791f -s ours
am: 335ae79ca5 -s ours Change-Id: Idae5f223ef4037777640955062affde7118485e1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions