tree ef4a04e50982e1a4d9886a9443b2b6ce0908b70c
parent 8a48ae9737cf7b78c3cfd304b8c975fe644cc310
parent 799998013b609bbce50cac6a887a6be2ba453bd1
author Narayan Kamath <narayan@google.com> 1371115756 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371115756 -0700

am 79999801: Merge "Fix URLConnectionTest after latest okhttp update."

* commit '799998013b609bbce50cac6a887a6be2ba453bd1':
  Fix URLConnectionTest after latest okhttp update.