tree df7e1d30fa23e4603db379adf73874c7128b330d
parent ad064d48adcfac71bd04d9f3bb5ea9d607d132a7
parent 686e4d57d8679ad4759ce872181294444a324638
author John Spurlock <jspurlock@google.com> 1416540998 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1416541000 +0000

Merge "Doze: Make proximity check configurable." into lmp-mr1-dev