tree a1607247ab6e04d52f8d625e866e7e587d7b62d7
parent 328acffd8b2ba73693da76ce85581661db45c5aa
parent 6198cac6bee0ce4da2de9e762d33d1c534959d7c
author Michael Jurka <mikejurka@google.com> 1305933258 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305933258 -0700

am 6198cac6: am 38d1b0b3: Determine # of rows/columns based on screen size DO NOT MERGE

* commit '6198cac6bee0ce4da2de9e762d33d1c534959d7c':
  Determine # of rows/columns based on screen size DO NOT MERGE