tree 3b263be5ee684843ce9489e9f94fe4a38f055d6f
parent 8433b63c0248b4c2650ee3d8db77aaba4748ae47
parent 704998abbafea84c28c0bcd0c540af87562b4cc9
author Jeff Brown <jeffbrown@google.com> 1412881741 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412881741 +0000

am 704998ab: Merge "Ensure we correctly unblank displays when added." into lmp-dev

* commit '704998abbafea84c28c0bcd0c540af87562b4cc9':
  Ensure we correctly unblank displays when added.