commit | 1e38fb24154be8350e7c1229c266f3f85af836b5 | [log] [tgz] |
---|---|---|
author | Brian Carlstrom <bdc@google.com> | Wed Aug 18 13:39:15 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 18 13:39:15 2010 -0700 |
tree | 0a610363214641b4366da2e1970e226fe739d9f3 | |
parent | 8c079611ee7d254c785c93d0aa54f19aebe29380 [diff] | |
parent | a50e810d16eb7fdddc73b11fd1539614a5fda14a [diff] |
am d313cab4: Merge "tracking merge of external/apache-http from dalvik-dev" into gingerbread Merge commit 'd313cab46e07c40f4cd1a94304a553e7eb809190' into gingerbread-plus-aosp * commit 'd313cab46e07c40f4cd1a94304a553e7eb809190': tracking merge of external/apache-http from dalvik-dev