tree fcf23a25aadc660bd2dbb8b5178da454e8a00f08
parent 909bcceeb449284823d8fdbe4556f89b96577d75
parent 9975db3a5ee777a0752a8b94cc4d666bc1f9bbfc
author Adam Cohen <adamcohen@google.com> 1445304635 +0000
committer android-build-merger <android-build-merger@google.com> 1445304635 +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

* commit '9975db3a5ee777a0752a8b94cc4d666bc1f9bbfc':