tree b676cc16d379478e8afdf21b5e45d0f00b5ec741
parent 9d3071e2e405782bcce388bd81d2f987179b2d2b
parent b3d6e58260c3468d3503a880d5ce4be7fe1f774b
author Adam Cohen <adamcohen@google.com> 1445310354 +0000
committer android-build-merger <android-build-merger@google.com> 1445310354 +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 am: bc4aed2eec am: e35bcf5d81
am: b3d6e58260

* commit 'b3d6e58260c3468d3503a880d5ce4be7fe1f774b':