tree 58208cc69b57a78a0cc90e81d73c3d8da55f3b7f
parent 72ba6264468573c21cc6bade65172be549f5b034
parent 900c9a61dee1511c9f4086ea5a3a3632b944cc0e
author Elliott Hughes <enh@google.com> 1428539486 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428539486 +0000

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

* commit '900c9a61dee1511c9f4086ea5a3a3632b944cc0e':
  Remove the fixed screen size assumptions.