tree fcf23a25aadc660bd2dbb8b5178da454e8a00f08
parent 522d4ac6fe7e174b24e01fa7764ca7cfba2c2f12
parent 48431f52c238c8a987d905546d265d1ac88e2cce
author Adam Cohen <adamcohen@google.com> 1445305742 +0000
committer android-build-merger <android-build-merger@google.com> 1445305742 +0000

am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop am: cb20616a18 am: 86b4730bb5 am: 278d4d2d5a am: 9975db3a5e
am: 48431f52c2

* commit '48431f52c238c8a987d905546d265d1ac88e2cce':