tree b198bb1ce4d80720c525a83a4fe5d6db7ee1e502
parent e81650071c84436cd996f73d40ad074c43782a32
parent 250678ad773cfa51d31e8c457b35a37e0b5b1a32
author Adam Cohen <adamcohen@google.com> 1413649674 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413649674 +0000

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

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