tree 33abdd44916b4621e4bb735fa45b3a711cfc73ca
parent 63d842cc4da3c2eb998aaf9adacbf20e833dff02
parent ed5cc0e1f7648962f5c93e1277d282be75bcd537
author Chris Wren <cwren@android.com> 1340305423 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340305423 -0700

am ed5cc0e1: revert I057b7ac0 now that the layouts are the expected height.

* commit 'ed5cc0e1f7648962f5c93e1277d282be75bcd537':
  revert I057b7ac0 now that the layouts are the expected height.