tree 7d3430abf4b9387a2acb7fc355f942a12a99586e
parent d4fc4a6915745c36cbc64618e97c1ac24665edb7
parent 60100296b93acc15264afc0f17eec14fb25b3fa2
author Adrian Roos <roosa@google.com> 1498610483 +0000
committer android-build-merger <android-build-merger@google.com> 1498610483 +0000

Merge "AOD: Pause sensors while proximity is covered" into oc-dr1-dev am: 01eb71112c
am: 60100296b9

Change-Id: If024d420e5285edce10b136fe1cc1f13ec3df46c