tree 144052dd035ca793f287e6acbf4df0ef7e5cd7cf
parent a2527055f8e3106fe70feeee10ae0c4ddc6596e9
parent d313cab46e07c40f4cd1a94304a553e7eb809190
author Brian Carlstrom <bdc@google.com> 1282163955 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282163955 -0700

am d313cab4: Merge "tracking merge of external/apache-http from dalvik-dev" into gingerbread

Merge commit 'd313cab46e07c40f4cd1a94304a553e7eb809190' into gingerbread-plus-aosp

* commit 'd313cab46e07c40f4cd1a94304a553e7eb809190':
  tracking merge of external/apache-http from dalvik-dev