tree 82db2e21449fd52665d7cff5f67b72ea655d185f
parent af6b00a8a0f1ccab15eda19b46bc2e31d5c70543
parent bc4aed2eec92820341d08fa32eb4bdcda1214242
author Adam Cohen <adamcohen@google.com> 1445307785 +0000
committer android-build-merger <android-build-merger@google.com> 1445307785 +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

* commit 'bc4aed2eec92820341d08fa32eb4bdcda1214242':