tree a1607247ab6e04d52f8d625e866e7e587d7b62d7
parent 2e8ba1c14793563701449c4ddf58b77ac3c36ea8
parent 38d1b0b3520243505a4a1469b5730e0b9c7e24ce
author Michael Jurka <mikejurka@google.com> 1305929932 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305929932 -0700

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

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