tree 00c8676dbfe52bae7b01fef9e1999477b670c2f6
parent 9bb8e5cc3e9f8ae2c46967ee1fd422f3bf1e9429
parent 043581382e43acbe29a8a62420bc765f49a9dd90
author Mathias Agopian <mathias@google.com> 1287100265 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287100265 -0700

am 04358138: Merge "[3095807] screen takes a long time to turn on" into gingerbread

Merge commit '043581382e43acbe29a8a62420bc765f49a9dd90' into gingerbread-plus-aosp

* commit '043581382e43acbe29a8a62420bc765f49a9dd90':
  [3095807] screen takes a long time to turn on