summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-07-29 20:55:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-29 20:55:07 +0000
commit1a9097b5695759aa1e9e8fea563a7a569c0b345f (patch)
treed0055a9fbb5f3436d9d3540c19415abda03e71ea /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf9ff3a27c6e6cdea7a0f05024de22bc2bad9312a (diff)
parentd02e90f2c3917a983ed7f543efa30c05a34ee3ea (diff)
am d02e90f2: am 5466d754: am 4c06870d: am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev
* commit 'd02e90f2c3917a983ed7f543efa30c05a34ee3ea': Ensure maxHeight is at least 0 during measureChildHorizontal()
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions