tree 02d746458ccaefe2ce6f7cd4f3c5f2033442c0be
parent 4c5ac591f4c88203749a051cc9b7bce92e90abee
parent 63f9ac87de6ef945c8127b186af6ab50c49d8c23
author Michael Jurka <mikejurka@google.com> 1306196337 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306196337 -0700

am 63f9ac87: (-s ours) am 6198cac6: am 38d1b0b3: Determine # of rows/columns based on screen size DO NOT MERGE

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