tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 7267b352a715a47c4531cf5ca98a05d463e206d1
parent 4e01b113c74e56454f9c5eb677d1039ddeabcd46
author Winson Chung <winsonc@google.com> 1392411503 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411503 +0000

am 4e01b113: am f54ba971: am e7fe339a: am c6b2499e: am 672b5ea1: Merge "Fixing issue where incorrect min/max widths/heights were being reported to widgets. (Bug 10940505)" into jb-ub-now-indigo-rose

* commit '4e01b113c74e56454f9c5eb677d1039ddeabcd46':