tree f0a565fb09ef9bfdd25b35ff31a88e674fa77a4b
parent 3b7f0afc649ad3985add2bc21362382d978f0078
parent ca00240fe4584768446fbb5f68eda8b7871fee9f
author Winson Chung <winsonc@google.com> 1392411753 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411753 +0000

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

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