Merge "Merge "DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours am: 03c946e06b -s ours am: c2aed112a7 -s ours am: a481fd31cf -s ours" into nyc-mr2-dev-plus-aosp am: 3039f42e67 -s ours"

This commit is contained in:
Android Build Merger (Role)
2016-12-14 18:47:09 +00:00
committed by Android (Google) Code Review

Diff Content Not Available