| commit | 223182e7adf291d343b36c8e5d38fc0195e02b97 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Dec 14 18:47:09 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Dec 14 18:47:12 2016 +0000 |
| tree | ab213f4cea791401edf8e749989c49f951602947 | |
| parent | 40ac6b0e94c606322285b36a4b49c3a4536e448f [diff] | |
| parent | 51ffef2596cb0a0820402a54c82c52c783f5cf54 [diff] |
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"