diff options
| author | Chris Tate <ctate@android.com> | 2015-08-07 18:40:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 18:40:38 +0000 |
| commit | 94275813c28133b2ef421874c8345c2bee9ca454 (patch) | |
| tree | e3842b729479a6cdc8b1abf884224a16c6029034 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 70419f5ab53889d7a4636e3fd62b7c3a7f9e8b54 (diff) | |
| parent | 117f024b2566e8cce7b0d0669ce528dac7aa23ac (diff) | |
am 117f024b: am db0cff71: am c376afb4: Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev
* commit '117f024b2566e8cce7b0d0669ce528dac7aa23ac':
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