summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorDiego Perez <diegoperez@google.com>2015-07-21 16:16:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-21 16:16:59 +0000
commit3b2ebfa3d1d08cd144c48fcd387612ee7defef01 (patch)
tree4764f4547f4d805b018589ea260ec0d04e71f3b1 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf2f29dc4add3943eb4f0b06a5c748b99664212da (diff)
parent224dfca641fb02b4a4a47deeeda9d03036c613fa (diff)
am 224dfca6: am c273c178: am 66e66831: Merge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev
* commit '224dfca641fb02b4a4a47deeeda9d03036c613fa': Render to measured size when using expand mode
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions