summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorFyodor Kupolov <fkupolov@google.com>2018-04-02 20:22:44 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-04-02 20:22:44 -0700
commite5b4a8d9cca8ceec4f1c9132f99a2a6b8fdd689f (patch)
tree78a55b8624735a5f68db00a134d39dd8f82beefb /tools/aapt2/java/JavaClassGenerator_test.cpp
parent0e2563284c2cb2b505eff2e8cadd49bfaaaa4a2b (diff)
parent3e8e71d1ec5d7bc1f2bf75eb8f8631ac3d0574ab (diff)
Merge "[automerger skipped] Use concrete CREATOR instance for parceling lists am: 4921986db7 am: 609bc2d63e am: 3f13ccee8c -s ours" into pi-dev
am: 3e8e71d1ec -s ours Change-Id: I921551eb006ac41034c730ad5d27c2831160ad9b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions