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 | e1d522cc10fa3c8e1e6c18b9dd3fd2622acb4700 (patch) | |
| tree | 1ab9fec699641f5be0d4ba9dd2c5d44fd21b0bd0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 07048a6c5de38cd78c9c3d60d3f7df4493d1daf1 (diff) | |
| parent | e4295dc132370f4c7da2df7d72fba681b6e85629 (diff) | |
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 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions