tree 791e8a024420d9fc398174c0a56fc1722d4c771c
parent 3eaeafbebf191a5ea5c98592f2042424b3610fbd
parent 99ee66568bb94e2d4f4392101a1a9eb32c086c83
author Adam Cohen <adamcohen@google.com> 1445306741 +0000
committer android-build-merger <android-build-merger@google.com> 1445306741 +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
am: 99ee66568b

* commit '99ee66568bb94e2d4f4392101a1a9eb32c086c83':