diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-18 16:05:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-18 16:05:03 -0700 |
| commit | 06cd9298ee175bc45d83c73a25fb26b7f15d4814 (patch) | |
| tree | 7b75c46004b807f9a00d6bd39a35f03add671a49 | |
| parent | 0c8300bccd4d1dfdf6b746d8d89ac526733f0181 (diff) | |
| parent | c70bdbc1eb32e81259dbb4a5c028efef354e9c54 (diff) | |
| download | external_apache-http-06cd9298ee175bc45d83c73a25fb26b7f15d4814.zip external_apache-http-06cd9298ee175bc45d83c73a25fb26b7f15d4814.tar.gz external_apache-http-06cd9298ee175bc45d83c73a25fb26b7f15d4814.tar.bz2 | |
am c70bdbc1: manual merge - fix build
Merge commit 'c70bdbc1eb32e81259dbb4a5c028efef354e9c54' into dalvik-dev
* commit 'c70bdbc1eb32e81259dbb4a5c028efef354e9c54':
Cherry picking changes from dalvik-dev
0 files changed, 0 insertions, 0 deletions