| commit | da03ed5de6ea7df92045014ff5b0087a8dc320df | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Mon Sep 08 23:31:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 08 23:31:10 2014 +0000 |
| tree | cca2c9220262d6ff11d415a3d1f9ccd3ae050c4b | |
| parent | 32bd8ee81a423c7d35228c8436b874c6105c7f13 [diff] | |
| parent | 68f92691d0f11d46e7cc0717dd1d46acac8b90f7 [diff] |
am 56d11c6e: Merge "Allow wake keys to wake dozing device." into lmp-dev * commit '56d11c6e833a6c10dd462203545968ed293bb323': Allow wake keys to wake dozing device.