tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 920971ab0729e72adebc6dc06595fbebf9c6f775
parent c79518f3005756615df68729313d96cf65cb20f8
author Adam Cohen <adamcohen@google.com> 1422685369 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685369 +0000

am c79518f3: am ab5af008: am 12429e46: am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop

* commit 'c79518f3005756615df68729313d96cf65cb20f8':