tree 10da860fcff71886af91d082e31f0e1917926848
parent ee82d2f21dc3f89f43601b3f60ed0155f0711c9f
parent 12429e46b195281e0c43c8edfaf23b8ae42e76ff
author Adam Cohen <adamcohen@google.com> 1422666553 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666553 +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':