tree 7802d47503458bdbde863366ae49f46115a7afc4
parent a703eb0fdf4b722939d601f667c0d123e86b59a7
parent d8f6253e67d23dcdcf521b0558f193ae832743b2
author Adam Cohen <adamcohen@google.com> 1411196054 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411196054 +0000

am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop

* commit 'd8f6253e67d23dcdcf521b0558f193ae832743b2':
  When ensuring screen exists, make sure it's actually referring to a screen, not a rank