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-23 01:11:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-06-23 01:11:34 +0000
commit95eb07851ade1a48936d3ced38cae9949c5b641a (patch)
tree2a75a6b0deb1710a503b7744b1a3aa50b10caf10 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent7548d9bc6d00e8f175136ca0d7d9e300fe21909e (diff)
parent5c2d170aa58719f937f74b95c71ce6ca88dcd395 (diff)
Merge "Merge \\"Show unsopported display size dialog on relaunch\\" into nyc-dev am: 354c8cde6c am: c13127f2be" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions