am 943a8bec: Merge "Increase busy timeout." into jb-dev
am 943a8bec: Merge "Increase busy timeout." into jb-dev

* commit '943a8beca566e9b7c3e26c7c7526d2b624e51c0e':
  Increase busy timeout.

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