tracking merge of external/apache-http from dalvik-dev

Change-Id: I25d7659b25f86f88cb36b4f80589b8c3e3a8c6b2
2 files changed