tree a611d06246c7e9beff0adc810e7eed0d30eeb965
parent 12b6fa1da82567b9a36664b759d10464f4970e6f
parent 919139247ccf5ade7c24ec1a9499a377be5498c2
author Mathias Agopian <mathias@google.com> 1318310517 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1318310517 -0700

Merge "fix an issue where the screen could stay off"