summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-06-09 21:10:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-09 21:10:06 +0000
commit83bbb161fa66d66063aac54ac58c6ae6afb6369d (patch)
tree96a8c0cf6bf234f76dd42be73c1a53d8967766eb /tools/aapt2/java/JavaClassGenerator_test.cpp
parent948b94ff2f024139aa8fee0034956af23411724b (diff)
parent149d6a63ca1b71a439192c5cd7fea9f9367c549a (diff)
Merge "Merge \\"Make Activity.getReferrer tolerate custom Parcelables in intents\\" into nyc-dev am: 7a37f8945f am: fb310f6a2f" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions