diff options
author | Lajos Molnar <lajos@google.com> | 2013-10-03 15:40:30 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-03 15:40:30 -0700 |
commit | 04e6ab6e27c39604a7029467161a90af78ecdf07 (patch) | |
tree | 64a51c868ca7feb2ec36591cd1233ae80b14ce7f /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 6be1d210eef392f5745d58a0033572b1af4b2f2a (diff) | |
parent | b1f94ef3f97bd20b928cf980791526861650eab9 (diff) |
am b1f94ef3: Merge "media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams" into klp-dev
* commit 'b1f94ef3f97bd20b928cf980791526861650eab9':
media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions