tree ade6ea969d423cb59f09757a775c02b4e6acfa43
parent b278280b028cb4ce6fc904f4fda7dd3b1808fc5f
parent f7cdd053fe1fee093f6b0973ad5723765f98a48d
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"