summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorFyodor Kupolov <fkupolov@google.com>2018-04-02 23:29:11 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-04-02 23:29:11 -0700
commitb68f0d37b769ec0c54d2ce3ee5f1506d7d61f5ee (patch)
tree284f78f8e089c3885ddce1563e2748ef5637ae8c /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta99fa2856d8f854367b54d6d7d613bf6f8ecdbd3 (diff)
parente5b4a8d9cca8ceec4f1c9132f99a2a6b8fdd689f (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
am: e5b4a8d9cc -s ours Change-Id: Id3a29c32331d9cd75585f11d8757d98297681725
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions