tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 669ef65afbb3799333b4e961371b920653ec870f
parent 86b4730bb5217268c3abd4444c34b2876a7c3ebc
author Adam Cohen <adamcohen@google.com> 1445302443 +0000
committer android-build-merger <android-build-merger@google.com> 1445302443 +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

* commit '86b4730bb5217268c3abd4444c34b2876a7c3ebc':