commit | de7c9b964f160f3360bc8df1a3d74d82bcb785d9 | [log] [tgz] |
---|---|---|
author | Jeff Brown <jeffbrown@google.com> | Sat Sep 20 02:05:03 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 20 02:05:03 2014 +0000 |
tree | 1ffaceea3fe0a413ab1d8ff5b995ff46fe7ad104 | |
parent | 4ed1dbcf0bd8565e309a3d964e7eaab0535803b9 [diff] | |
parent | e8e3125eebbddf849fe2bf1ad21a6294ffd1bb0a [diff] |
am a94c9ccb: am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev * commit 'a94c9ccb8a7f85ff2a3e1329e94367c863f39309': Decouple turning screen on from waking up in policy.