tree 788aa9b1c0fc6dc00a501cffd8cc827005c6da58
parent 6317598a196ada3f32950c7f4a8d5cfe005acf42
parent d8f6253e67d23dcdcf521b0558f193ae832743b2
author Adam Cohen <adamcohen@google.com> 1413648342 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413648342 +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