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

Merge commit '03805f729cacead5d0797c840430ea99b26036d6'

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