diff options
| author | Vinit Deshpande <vinitd@google.com> | 2013-07-03 08:32:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-03 08:32:32 -0700 |
| commit | 2120bbb2c7ccef3cc76bb0886dfa9467a47b8dde (patch) | |
| tree | 34742494cd3bb259e1debb0753f9fba8237da5bb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c2dba2be4be2776dafb951fd3fe8e430bf1587da (diff) | |
| parent | 6ea2faf8ca7e1d7f75e41c9b13d36fa47436e1cc (diff) | |
am 6ea2faf8: am 64036633: am c2656a98: Merge "Revert "Temporarily disable \'Scan Always\' mode"" into jb-mr2-dev
* commit '6ea2faf8ca7e1d7f75e41c9b13d36fa47436e1cc':
Revert "Temporarily disable 'Scan Always' mode"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions