commit | 51ffef2596cb0a0820402a54c82c52c783f5cf54 | [log] [tgz] |
---|---|---|
author | Julius D'souza <jdsouza@google.com> | Wed Dec 14 18:46:04 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Dec 14 18:46:04 2016 +0000 |
tree | a6ff34a83ffe883f81f068c06abc7ffbbcb7b7f6 | |
parent | 5bdfa357e0477d981c402ade17e9128b670a5c92 [diff] | |
parent | 3039f42e67e7dd03c65571801d2ef055e5e9f1a0 [diff] |
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 Change-Id: I72ad5601778873513d3b669adbb664435daccbf1