tree f0a565fb09ef9bfdd25b35ff31a88e674fa77a4b
parent 6772fd99c7539b367c1ac5892e6597dd91d2d97f
parent cd1092ce7bff3d4c4372a3a93c055d24ffdbaafc
author Winson Chung <winsonc@google.com> 1392411276 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411276 +0000

am cd1092ce: am b6147f85: Merge "Adjusting grid for tablets and fixing incorrect resources for large tablets." into jb-ub-now-kermit

* commit 'cd1092ce7bff3d4c4372a3a93c055d24ffdbaafc':
  Adjusting grid for tablets and fixing incorrect resources for large tablets.