tree 58208cc69b57a78a0cc90e81d73c3d8da55f3b7f
parent 9e0d0c7c917ae87dcb76a8208f7d7b62feb72196
parent 0d4f2b6d9ad1c5980f3ece965c4c4a49726c29f4
author Elliott Hughes <enh@google.com> 1428541409 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428541409 +0000

am 0d4f2b6d: am 900c9a61: Merge "Remove the fixed screen size assumptions."

* commit '0d4f2b6d9ad1c5980f3ece965c4c4a49726c29f4':
  Remove the fixed screen size assumptions.