diff options
| author | Christopher Tate <ctate@google.com> | 2013-06-11 15:07:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-11 15:07:00 -0700 |
| commit | 1bc14ed9c3bb0fae28c2cdf9319b2f5f892409eb (patch) | |
| tree | 6f51b95810e166ac78ef103ff2be3022bdae48d5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 799f031a64d3930b85b9232bac344b1f9f216717 (diff) | |
| parent | 76b76666f5c28751db6ed8791fd54ec430d4361a (diff) | |
am 76b76666: Merge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev
* commit '76b76666f5c28751db6ed8791fd54ec430d4361a':
Need to explicitly disable scan-always when turning off wifi
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions