Merge commit 'd313cab46e07c40f4cd1a94304a553e7eb809190' into gingerbread-plus-aosp * commit 'd313cab46e07c40f4cd1a94304a553e7eb809190': tracking merge of external/apache-http from dalvik-dev
Merge commit 'd313cab46e07c40f4cd1a94304a553e7eb809190' into gingerbread-plus-aosp * commit 'd313cab46e07c40f4cd1a94304a553e7eb809190': tracking merge of external/apache-http from dalvik-dev