tree ec2722ce2e5bc60efa2c7656a562244aa92b9307
parent b05305c19060ef6c8cc95222f96f777a710a982f
parent bdc9d47c62373a38b447e817b30d6b5c166c283f
author Adrian Roos <roosa@google.com> 1499450074 +0000
committer android-build-merger <android-build-merger@google.com> 1499450074 +0000

Merge "AOD: Fix possible NPE in DozeSensors" into oc-dr1-dev am: d7aa26f33b
am: bdc9d47c62

Change-Id: Ife7e47b06d08967a210ae6db46bbaa015926302e