tree b198bb1ce4d80720c525a83a4fe5d6db7ee1e502
parent 1dd8d00ba22c44e83139af7fe2261936219863c9
parent cb20616a180de2855cc35e6c1ce8dfb8082ea41c
author Adam Cohen <adamcohen@google.com> 1413648491 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413648491 +0000

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 'cb20616a180de2855cc35e6c1ce8dfb8082ea41c':
  When ensuring screen exists, make sure it's actually referring to a screen, not a rank