tree d773639dfaaf0127283b4494f54a74d44a1e324a
parent 03937ac5d7c2dae4d730bc6cea6d42c63ad13181
parent 278d4d2d5af5abff45633301976e861196bd90ac
author Adam Cohen <adamcohen@google.com> 1445303537 +0000
committer android-build-merger <android-build-merger@google.com> 1445303537 +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

* commit '278d4d2d5af5abff45633301976e861196bd90ac':