tree 03f9054557b37588c39076defc838e0effc12b82
parent f7bb4fab28e8d5cc517800638a72c481fec957ed
parent 731c6e97719aec526ed4bf409a8c05338596c0a4
author Neil Fuller <nfuller@google.com> 1420574214 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420574214 +0000

am 731c6e97: am 0117b2de: Merge "Remove NPN support from Android\'s OkHttp Platform class"

* commit '731c6e97719aec526ed4bf409a8c05338596c0a4':
  Remove NPN support from Android's OkHttp Platform class