summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSuprabh Shukla <suprabh@google.com>2016-06-24 16:36:55 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-24 16:36:55 +0000
commit5c451c08bc51c8fdb033263a701f0397d12ac255 (patch)
tree4452c659a756d005be5e09aeaef25d6959717529 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentac77f46643e756834602e74f506c71d52ab7a775 (diff)
parentbb1fb395cae4dd92739db4ce6fa48037ba5383f6 (diff)
Merge \"Resetting some settings on starting a new demo session\" into nyc-mr1-dev
am: bb1fb395ca Change-Id: Ic7b7520d4fa3cbfc79be49ded8a4ffd133d2b037
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions