diff options
author | James Dong <jdong@google.com> | 2010-08-26 09:53:30 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-26 09:53:30 -0700 |
commit | 64b531e9a119c2458e48c134fc4385ca074e0d12 (patch) | |
tree | 548d50b6234296cce4af984c4802aef273541a26 /media/mtp/MtpEventPacket.h | |
parent | 90e4b45495f806f937fcdb52e18842237fccd5fb (diff) | |
parent | 640a72ecf2feb1ee5152d70234ff48d3be0e5ddf (diff) | |
download | frameworks_av-64b531e9a119c2458e48c134fc4385ca074e0d12.zip frameworks_av-64b531e9a119c2458e48c134fc4385ca074e0d12.tar.gz frameworks_av-64b531e9a119c2458e48c134fc4385ca074e0d12.tar.bz2 |
am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread
Merge commit '318a759e3c24dd741f8959e2a433150ae88fb8d6' into gingerbread-plus-aosp
* commit '318a759e3c24dd741f8959e2a433150ae88fb8d6':
Make sure that timestamp does not go backward in MP4 file writer
Diffstat (limited to 'media/mtp/MtpEventPacket.h')
0 files changed, 0 insertions, 0 deletions