| commit | 959312701f55c9d098403c332b88b5777daf4e4c | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Thu Dec 04 15:15:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 15:15:59 2014 +0000 |
| tree | fa0ae77983678a3c83fd87a73ed8b4df307a998c | |
| parent | 38916819693a69fbc882ac509e60ef0b6419c5dc [diff] | |
| parent | 32b61ab28f54e5b00f472b2166f9b1100375e4ff [diff] |
am 32b61ab2: Merge "Doze: Don\'t block pickup pulses on a proximity check." into lmp-mr1-dev * commit '32b61ab28f54e5b00f472b2166f9b1100375e4ff': Doze: Don't block pickup pulses on a proximity check.