summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-04-02 23:13:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-04-02 23:13:36 +0000
commit3e8e71d1ec5d7bc1f2bf75eb8f8631ac3d0574ab (patch)
treec144601086d7ba6523d073f4d88e1b77356285ee /tools/aapt2/java/JavaClassGenerator_test.cpp
parentcccd67b574c39547195fe06b781cb3bfd8d9d4dd (diff)
parent5fdd8491e9dd5c437e46245c79bf3b5a0fb31866 (diff)
Merge "[automerger skipped] Use concrete CREATOR instance for parceling lists am: 4921986db7 am: 609bc2d63e am: 3f13ccee8c -s ours" into pi-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions