tree cba62d0d64153aa2169651696bc238591341d679
parent f2e7e3347d291fe2af34feb59092781842ab3d38
parent ca00240fe4584768446fbb5f68eda8b7871fee9f
author Winson Chung <winsonc@google.com> 1414085542 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085542 +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':