diff options
| author | Andreas Huber <andih@google.com> | 2010-06-11 11:00:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-11 11:00:44 -0700 |
| commit | 0c9e60c772ae007a68cbfa46e0d2fb429376cfd2 (patch) | |
| tree | 7ded637673509593f63b3666b7132183d29ef13e /media/mtp/MtpDevice.cpp | |
| parent | 7b752795080568c422ea581a645ad1333c075042 (diff) | |
| parent | b55cf746536962d262c3b627e32a37464927b67b (diff) | |
| download | frameworks_av-0c9e60c772ae007a68cbfa46e0d2fb429376cfd2.zip frameworks_av-0c9e60c772ae007a68cbfa46e0d2fb429376cfd2.tar.gz frameworks_av-0c9e60c772ae007a68cbfa46e0d2fb429376cfd2.tar.bz2 | |
am 0905ba7b: am f5eafe40: Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken
Merge commit '0905ba7ba62567c1d1b5b0567827c35d40390b52'
* commit '0905ba7ba62567c1d1b5b0567827c35d40390b52':
Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.
Diffstat (limited to 'media/mtp/MtpDevice.cpp')
0 files changed, 0 insertions, 0 deletions