tree abe34e0c69dbd3446e88af830289df7e78d415f1
parent f2bf48b7c6d9edfe4c391687e744484a5b65672f
parent beae3bd6d34472d27ac5698f8d9bcbc12d0cf4f0
author Dianne Hackborn <hackbod@google.com> 1316647118 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1316647118 -0700

Merge "Improvements to power manager turning on screen."