am fb238e46: am 0c179788: am 1b62da75: am 6b93b185: am 3eee5cd2: am 53b37dc0: Merge "Fix a layout problem for pre-MR2"

* commit 'fb238e463d6c007939d569ef6923821b854ebfa7':
main
Jean Chalard 2013-09-26 06:52:41 -07:00 committed by Android Git Automerger
commit 6adf817f77

Diff Content Not Available