tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent a0996b14d963cec4028afe2f81eb6541814aa441
parent e7fe339af86194b2b872ba9a1ba39bae06e3db29
author Winson Chung <winsonc@google.com> 1392410116 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410116 +0000

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