diff options
author | Alan Lau <alanlau@google.com> | 2014-07-30 21:14:33 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-30 21:14:33 +0000 |
commit | d38347ec51e544c0faf59736de3d4b044f59ac6a (patch) | |
tree | f9426ba81be0bd5ecd2fffc62451602faba68985 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 6a93d9d346045dd768dda3d4d523a4bd3b8c3b5f (diff) | |
parent | 40274ada4a8699a18836c369ca26ebb837ca37f2 (diff) |
am 40274ada: (-s ours) am b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev
* commit '40274ada4a8699a18836c369ca26ebb837ca37f2':
Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions