tree 270af0dbefbf700ffebcd3076b7d25545a2d9dfe
parent c0c4e7f9a14305acecb3ca530fd1c33d837ac884
parent 939171ee8bdb38ce3d31817af67d10fb98f94d94
author Adrian Roos <roosa@google.com> 1498663916 +0000
committer android-build-merger <android-build-merger@google.com> 1498663916 +0000

Merge "AOD: Proximity check doze triggers" into oc-dr1-dev
am: 939171ee8b

Change-Id: Id9694514f9f48f659d7df56f05c5e4492a30de2b