am 6b93b185: am 3eee5cd2: am 53b37dc0: Merge "Fix a layout problem for pre-MR2"

* commit '6b93b185efbe6e2ce876f962783799464c081f62':
This commit is contained in:
Jean Chalard 2013-05-15 12:28:09 -07:00 committed by Android Git Automerger
commit 1b62da7530

Diff content is not available