Merge "Fix some potential power-draining race conditions" into cw-f-dev

am: efc2c764f1

Change-Id: I772ae4e186332d1fc13a694c3c7e61fbbc6ac1d3
This commit is contained in:
Nick Vaccaro
2016-08-22 22:05:40 +00:00
committed by android-build-merger

Diff Content Not Available