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 | 6ee7bca1ce7f93d33a70701bb7862c3d13e68b89 (patch) | |
| tree | d9eabbdf1f699103301cbdad7d0dc5fa0f4a4ae3 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7c92e2dccb4e5cb5314455692ac32d2ccff24292 (diff) | |
| parent | 3de8d36b6fd166cf63ca256c455c0ea26a849668 (diff) | |
am 3de8d36b: Reconcile with ics-mr0-release
* commit '3de8d36b6fd166cf63ca256c455c0ea26a849668':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions