tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent e41059eb983e787ef68fddb0f4c2c1ead7f88944
parent ab5af008ce894d6df9baaf5f9f93bea076b56a2c
author Adam Cohen <adamcohen@google.com> 1422669738 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669738 +0000

am ab5af008: 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 'ab5af008ce894d6df9baaf5f9f93bea076b56a2c':