tree e84bc7b70a7a7c0503d3deaae51029e4cb0119dd
parent d6b50a4872fddefeb2fb24538631270af5d52b0c
parent b6147f85786c78b3608eabf2286cd9e61c28878d
author Winson Chung <winsonc@google.com> 1392410322 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410322 +0000

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

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