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

am: 1f817c61cf

Change-Id: I7023d1196fe30a7c18501cd401a0305241b8d2ea
This commit is contained in:
Nick Vaccaro
2016-08-22 22:12:32 +00:00
committed by android-build-merger

Diff Content Not Available