| commit | f3c06fd8045d5f2abad3e4f73edac3698ed7632b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Sep 08 10:28:41 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 08 10:28:41 2010 -0700 |
| tree | 5c153ebeac0216779c05666f22955f64bbb8d505 | |
| parent | 398143d91911fe7376816257175764883b40f067 [diff] | |
| parent | 0e1ce57218300b095f34d641ed2f2b64597fb9bd [diff] |
am 84f992a2: resolve conflicts Merge commit '84f992a249491b9f755e879bf096baac3f9472f5' * commit '84f992a249491b9f755e879bf096baac3f9472f5': Adding Download Manager Integration, stress, and hosts-based tests.