tree 2626d40ecf1731985622d52746c65b89d5358a60
parent cd7506b09e094f78da9eeb081c5ff3c706733ca0
parent cfa2143be012b18239a0574aed72ebe843293b3f
author Neil Fuller <nfuller@google.com> 1413451975 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413451975 +0000

am cfa2143b: Merge "Fix OkHttp test failure for fast devices"

* commit 'cfa2143be012b18239a0574aed72ebe843293b3f':
  Fix OkHttp test failure for fast devices