tree cafad64d5a1f31de10a6e0b6bf0df5f3799c3dad
parent 45778999c705683ec0fcca3e90c7e9969e081d93
parent 3292cae8c37fc8d7cd8bf77fafaa55e6fc7a8cc5
author Jeff Brown <jeffbrown@google.com> 1349826655 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349826656 -0700

Merge "don't automatically unblank external displays" into jb-mr1-dev