diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-19 18:31:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 18:31:11 +0000 |
| commit | 10e4a45f691e6b60278fc772dedfe7646e615d0e (patch) | |
| tree | 94c5301177564ea89b8c725b7d40a51f0d1475bd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2ccf4779ad24b86aeca7fe32eced1e4a8006999c (diff) | |
| parent | 387116f557c3d3ecf7bd82e1d9dd1910ca4c4a3d (diff) | |
am 387116f5: am c3507d10: Merge "Frameworks/base: Replace LOG_FATAL_IF in core/jni"
* commit '387116f557c3d3ecf7bd82e1d9dd1910ca4c4a3d':
Frameworks/base: Replace LOG_FATAL_IF in core/jni
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions