diff options
| author | Xia Wang <xiaw@google.com> | 2011-12-05 16:32:59 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-05 16:32:59 -0800 |
| commit | 1fd291144cd533800630c461d4fe9119f446a726 (patch) | |
| tree | e8f52cd9aee97f70d4720ecd492f71b9f9c6190b /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6a2b621c79f2e64938977dea63c8907bd903f1b6 (diff) | |
| parent | 96f660f4a8b99ff387e17474f2574e4e284ceeb8 (diff) | |
am 96f660f4: am e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1
* commit '96f660f4a8b99ff387e17474f2574e4e284ceeb8':
Add extra 2 minute for wifi to shutdown
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions