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