commit | 1b82e3935f1f986b6d7039b63cb3f751699c75df | [log] [tgz] |
---|---|---|
author | Daisuke Miyakawa <dmiyakawa@google.com> | Thu Oct 13 19:26:45 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 13 19:26:45 2011 -0700 |
tree | 2dbd44e9355fdc55591a8b3db973c8cf906960bf | |
parent | 78af83f34b60bfb0e62e7b97a560a99296e960b4 [diff] | |
parent | c7d1754d59c4b40ac981529847fc7e570ffbd87e [diff] |
am 420fa444: (-s ours) DO NOT MERGE. Use minHeight to allow large fonts. * commit '420fa4442a31b5541844a0f46604f359e07b61ed': DO NOT MERGE. Use minHeight to allow large fonts.