tree 10da860fcff71886af91d082e31f0e1917926848
parent 544c09625abecfa1d1a45ed3ce5e6f8a67c437d0
parent 447d9c3b56b0f688f675096a687015007055f265
author Winson Chung <winsonc@google.com> 1414566432 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566432 +0000

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

* commit '447d9c3b56b0f688f675096a687015007055f265':