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