diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2011-12-07 07:27:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-07 07:27:57 -0800 |
| commit | 8abaab91b2e54e9208dc253452670372975942e6 (patch) | |
| tree | 0784d17d80f88a0c09f9a2c4f6ecc4047af63cef /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6f2e64fcf1f6df5613abc8503ea00e06a95ef39c (diff) | |
| parent | 9e86a344c12d9a51fbba00516878dcb64e67f2d5 (diff) | |
am 3de8d36b: Reconcile with ics-mr0-release
* commit '3de8d36b6fd166cf63ca256c455c0ea26a849668':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions