tree 9785f628e36d006cc5cf3dad0705d2cd45ebb69a
parent 98e52bdb18842a7a00e66bf6adb628f2512e2ef0
parent c5b58166e8170a415de108a72acfc432dec1b201
author Jeff Brown <jeffbrown@google.com> 1349826981 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349826981 -0700

am c5b58166: Merge "don\'t automatically unblank external displays" into jb-mr1-dev

* commit 'c5b58166e8170a415de108a72acfc432dec1b201':
  don't automatically unblank external displays