diff options
| author | Joe Onorato <joeo@google.com> | 2011-01-26 22:02:18 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-26 22:02:18 -0800 |
| commit | 48edeff1fdb69c99fadaa30743dc51e308bdbce9 (patch) | |
| tree | 0e1a9d2e630818a485a555fad06a5e6bd3989dcd /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 267604df1c10f2afa3914377e52482e494adac3c (diff) | |
| parent | d62cc7b256793b9adef9015abcb9f12d02f69437 (diff) | |
am ea1fbe9c: Merge "Revert "getRingtone is causing an anr. Turn it off for now."" into honeycomb
* commit 'ea1fbe9c8c9fe32690252dcc4dc96c93ae03f686':
Revert "getRingtone is causing an anr. Turn it off for now."
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions