diff options
| author | Chris Tate <ctate@android.com> | 2015-08-07 18:36:09 +0000 | 
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 18:36:09 +0000 | 
| commit | 117f024b2566e8cce7b0d0669ce528dac7aa23ac (patch) | |
| tree | 18e1d2a9408e16cdc19a3951502a020874b4b696 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5096ee814babf88cb50ed858f9cc4fef3ddf4f80 (diff) | |
| parent | db0cff71c8d1a7f7f1d5c12a4f7c343030adf21b (diff) | |
am db0cff71: am c376afb4: Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev
* commit 'db0cff71c8d1a7f7f1d5c12a4f7c343030adf21b':
  Wait a bit longer for wifi to shut down before rewriting the config
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
