summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 08:22:36 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 08:22:36 -0800
commita15081c3af2c6ecd5540cedc2e3c2868f4a6b897 (patch)
tree1cb8abc888170f4864a238bb260034859950fd01 /src
parent3e4f2ed52da10057cee97af16c9f1731e4e7b3d6 (diff)
parentc5718a3d3d1786d57998315641361809d8f03e79 (diff)
downloadexternal_apache-http-a15081c3af2c6ecd5540cedc2e3c2868f4a6b897.zip
external_apache-http-a15081c3af2c6ecd5540cedc2e3c2868f4a6b897.tar.gz
external_apache-http-a15081c3af2c6ecd5540cedc2e3c2868f4a6b897.tar.bz2
am c5718a3d: reconcile main tree with open-source eclair
Merge commit 'c5718a3d3d1786d57998315641361809d8f03e79' into eclair-plus-aosp * commit 'c5718a3d3d1786d57998315641361809d8f03e79': android-2.1_r1 snapshot
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions