summaryrefslogtreecommitdiff
path: root/opengl/libs/hooks.h
diff options
context:
space:
mode:
author James Dong <jdong@google.com> 2010-10-21 20:18:16 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-21 20:18:16 -0700
commit6123e0f7c91ffc7534da99b4668879dacf662227 (patch)
tree61c1e1915edcb8f4e5858ded4d8f79fe10cc21fe /opengl/libs/hooks.h
parenteb5aeae676fb23b2ad748185867c085e3cd65314 (diff)
parent1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410 (diff)
am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread
Merge commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410' into gingerbread-plus-aosp * commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410': Turn the media time adjustment in file writer back on
Diffstat (limited to 'opengl/libs/hooks.h')
0 files changed, 0 insertions, 0 deletions