diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-17 20:10:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-17 20:10:30 -0700 |
| commit | f211e5ab69b8f554b5e268699988640c2ec22255 (patch) | |
| tree | fcef34ddd74f27e692f3c2e2ea17802d5cdd3d11 /media/mtp/MtpDataPacket.cpp | |
| parent | 8206beb4953e42a727417286cdf9d52c35c2889d (diff) | |
| parent | 4a3935898893f955403021fe41cf2bfa3a32dde2 (diff) | |
| download | frameworks_av-f211e5ab69b8f554b5e268699988640c2ec22255.zip frameworks_av-f211e5ab69b8f554b5e268699988640c2ec22255.tar.gz frameworks_av-f211e5ab69b8f554b5e268699988640c2ec22255.tar.bz2 | |
am 09f67250: resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp
Merge commit '09f672509b78344258f1b0d9f021d2ec99942515'
* commit '09f672509b78344258f1b0d9f021d2ec99942515':
Fix compilation errors in libmedia, libstagefright.
Diffstat (limited to 'media/mtp/MtpDataPacket.cpp')
0 files changed, 0 insertions, 0 deletions