OSDN Git Service

am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API.""
authorNarayan Kamath <narayan@google.com>
Wed, 29 Oct 2014 19:34:10 +0000 (19:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 19:34:10 +0000 (19:34 +0000)
commit78b3f5ab70300548776e3b98ee6d8fb6b1f5318f
treeff3cef10247601cd7ace55021b4ec04bdf1b7c7b
parentb5ce284aa8e738de051572ab37a01d52fa7b1dac
parentfa945c105b4f7bb3e3844e8ce467ca701d5f3a9f
am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API.""

* commit 'fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f':
  Revert "Remove unused apache related API."
core/java/android/net/Proxy.java