OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 401de11 47a74e7)
am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal...
authorAlan Viverette <alanv@google.com>
Wed, 29 Jul 2015 20:13:07 +0000 (20:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jul 2015 20:13:07 +0000 (20:13 +0000)
* commit '47a74e7e2b45d9ec462f47f6741c381c478b4156':
  Ensure maxHeight is at least 0 during measureChildHorizontal()


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help