| commit | 5fbd9950e72e74b094b16a59045400ffdb432ad4 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Thu Nov 13 16:55:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 13 16:55:13 2014 +0000 |
| tree | 8b58798bbd250048bd2db10a94df5ac939c3b690 | |
| parent | 759d34cbd051c61b9f18bdb6576a943997a28510 [diff] | |
| parent | 76c234c8dfca8203521b022c15a38e041c294589 [diff] |
am 76c234c8: am d0d23c80: Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev * commit '76c234c8dfca8203521b022c15a38e041c294589': Fix wrong states when waking up from doze via touch