tree 7802d47503458bdbde863366ae49f46115a7afc4
parent 1f50d1241f075ae65e2a4b4970eb512f91d6465a
parent 12429e46b195281e0c43c8edfaf23b8ae42e76ff
author Adam Cohen <adamcohen@google.com> 1411196659 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411196659 +0000

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

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