diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-05-12 07:50:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 07:50:19 -0700 |
| commit | d6dc7432e105b1255bf11f8c10ead71f0a0fbb38 (patch) | |
| tree | 1da85f32dbecd5d62e79d5a68d57f0398547714b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 21fdf08187cb23f879ca0037efa9ea861542041f (diff) | |
| parent | 4ef3c6a7916509fb760dfe45946749f775192cf8 (diff) | |
am b1235a57: Merge "Hide two audio focus methods." into froyo
Merge commit 'b1235a57a09174179553acecef2370354bdcbf41' into froyo-plus-aosp
* commit 'b1235a57a09174179553acecef2370354bdcbf41':
Hide two audio focus methods.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions