OSDN Git Service

Merge "Doze: Don't block pickup pulses on a proximity check." into lmp-mr1-dev
authorJohn Spurlock <jspurlock@google.com>
Thu, 4 Dec 2014 03:03:20 +0000 (03:03 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 4 Dec 2014 03:03:22 +0000 (03:03 +0000)

Trivial merge