am 842725fc: (-s ours) am 4d825e1f: Merge "Bring in more layout lib changes...
am 842725fc: (-s ours) am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread
* commit '842725fc':
Bring in more layout lib changes from hc-mr1.