diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-31 13:16:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-31 13:16:16 +0000 |
| commit | 439cf5b433123970a94388cf9309d9ea4d31b3cb (patch) | |
| tree | 13c85d682902107a6152f4dfdc5f7d0cd7d01db0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 546bec8ebf2cf865e88d02cc8cb29563ad224967 (diff) | |
| parent | 56a8f8b48ff1d0855209307b9076d6e9b348b59b (diff) | |
am 56a8f8b4: resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp
* commit '56a8f8b48ff1d0855209307b9076d6e9b348b59b':
Don't make isSafeMode a field on the Zygote class.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions