summaryrefslogtreecommitdiffstats
path: root/MODULE_LICENSE_APACHE2
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2010-08-18 13:39:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-18 13:39:09 -0700
commitca487d902d42621b5db886d13d2acb4c9500a44c (patch)
tree7b75c46004b807f9a00d6bd39a35f03add671a49 /MODULE_LICENSE_APACHE2
parent301b1df2f0b25ef56a640840742c981623faf20f (diff)
parent166ed46d7e5312857b8a9b8d07c00373c596c1b3 (diff)
downloadexternal_apache-http-ca487d902d42621b5db886d13d2acb4c9500a44c.zip
external_apache-http-ca487d902d42621b5db886d13d2acb4c9500a44c.tar.gz
external_apache-http-ca487d902d42621b5db886d13d2acb4c9500a44c.tar.bz2
am 166ed46d: Cherry picking changes from dalvik-dev
Merge commit '166ed46d7e5312857b8a9b8d07c00373c596c1b3' into gingerbread-plus-aosp * commit '166ed46d7e5312857b8a9b8d07c00373c596c1b3': Cherry picking changes from dalvik-dev
Diffstat (limited to 'MODULE_LICENSE_APACHE2')
0 files changed, 0 insertions, 0 deletions