diff options
| author | Christopher Tate <ctate@google.com> | 2013-06-11 15:37:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-11 15:37:12 -0700 |
| commit | 2b3329bb73e0a5167aaf1b638f42c50f94d61bab (patch) | |
| tree | d015c23abed776ba335a2ee2284a73a5a08f53be /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b243f791d61f673abddc427e6733c4e63ba1f79f (diff) | |
| parent | 1bc14ed9c3bb0fae28c2cdf9319b2f5f892409eb (diff) | |
am 1bc14ed9: am 76b76666: Merge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev
* commit '1bc14ed9c3bb0fae28c2cdf9319b2f5f892409eb':
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