tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent fdaec6448b9b4d47e97249476179a00bad889f1c
parent f54ba97196d0fad4837d88df1689a4475650c830
author Winson Chung <winsonc@google.com> 1392410988 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410988 +0000

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 'f54ba97196d0fad4837d88df1689a4475650c830':