diff options
| author | James Dong <jdong@google.com> | 2010-10-05 15:17:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-05 15:17:29 -0700 |
| commit | bc16dbc810382c29c8122d060ce7c07058dca1be (patch) | |
| tree | c7f57a471ef7a293ba101955c412b9d2376d3908 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1f9f022c0743304f5d3d24adfbceb3da42c9ca74 (diff) | |
| parent | 90c9df0582ceb0929cfb9ceb7dc78dffc9754568 (diff) | |
am 6a02ba01: am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread
Merge commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db'
* commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db':
Resilent media time stamp adjustment
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions