commit | cbbb27bce21844157e57cdb40d665e28f1eb63e0 | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Wed Jun 28 15:38:52 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 28 15:38:52 2017 +0000 |
tree | d9d600df5b015378cbcafc4a95815de5517faeea | |
parent | 5896454353ddef68a7c64de84d6c2820063103aa [diff] | |
parent | 56fb90cf3e14b874d3702c6087e76a1bda922da1 [diff] |
Merge "AOD: Proximity check doze triggers" into oc-dr1-dev am: 939171ee8b am: 56fb90cf3e Change-Id: I03e74dab4e096ac8a9b5fc01dfd90ca745eabf09