am ca28410f: Merge "Increase idle time out to 25s" into jb-mr1-dev
am ca28410f: Merge "Increase idle time out to 25s" into jb-mr1-dev

* commit 'ca28410f0d17f2ea0bd3455f9d21898c0790b301':
  Increase idle time out to 25s

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base