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