am 74913572: am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should...
am 74913572: am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"
* commit '74913572':
StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)