am d81486d2: am 04c7923c: am 74913572: am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"
am d81486d2: am 04c7923c: am 74913572: am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"

* commit 'd81486d208062b188ce9be198f362bc69eb0c149':
  StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)

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