tree 5674f23d7e2186482a5153bcf1f46eb42c3be909
parent 3ac40c6ae4c6288fec50ed09549cb7a39c816ee0
parent 53b37dc098daf99151bf1b38d04bd202f8a3ba03
author Jean Chalard <jchalard@google.com> 1367402246 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367402246 -0700

am 53b37dc0: Merge "Fix a layout problem for pre-MR2"

* commit '53b37dc098daf99151bf1b38d04bd202f8a3ba03':
  Fix a layout problem for pre-MR2