commit | 4912049bc07f97f983e3390290975db60496275f | [log] [tgz] |
---|---|---|
author | Michael Wright <michaelwr@google.com> | Mon Sep 08 23:31:53 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 08 23:31:53 2014 +0000 |
tree | d2bdc956bcc8aad221d8ebd60c0a92283af8df73 | |
parent | d7b6de2f4dcc386c66159b3732a7b8dac6a12313 [diff] | |
parent | 56156c4c3abf4957a3fc294f3ee84ff87c171e3c [diff] |
am f07575ae: am 56d11c6e: Merge "Allow wake keys to wake dozing device." into lmp-dev * commit 'f07575aeeb840cdc14f1e6b4ff0d1343a30b00b6': Allow wake keys to wake dozing device.