tree 23135b85ed389619861d43f3f467cc99b1273a85
parent 709928de499013270f4f788e40f975df3d7dd38b
parent 76c674451c831c1e9c3e3ee134ea8af26ae19ac1
author Brian Carlstrom <bdc@google.com> 1365023545 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365023545 -0700

am 76c67445: Merge "resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aosp" into jb-mr2-dev-plus-aosp

* commit '76c674451c831c1e9c3e3ee134ea8af26ae19ac1':
  Add OkHttp to the boot classpath.