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

Browse Source

am: 3039f42e67  -s ours

Change-Id: I72ad5601778873513d3b669adbb664435daccbf1

...

This commit is contained in:

Julius D'souza

2016-12-14 18:46:04 +00:00

committed by android-build-merger

parent 5bdfa357e0 3039f42e67

commit 51ffef2596

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available