tree f2f4076b8b4e176256396e4227102eda5d5eacc2
parent d30f73725bf6f7b668244a0e51245a85005c3e9f
parent e47e8520fa48bd014287eda94ea39927de73d6bc
author Dianne Hackborn <hackbod@google.com> 1316643318 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1316643318 -0700

Merge "Keyguard sound needs to hold wake lock."