diff options
| author | smain@google.com <smain@google.com> | 2014-10-17 09:15:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-17 09:15:17 +0000 |
| commit | dfcdfbd64acc4d2135b28eb3d61d2a174748e55d (patch) | |
| tree | 2470c45866a1160ab1233a2e4b409c350d565b29 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7314b6076ecef1b79f205016544268ffd38112f3 (diff) | |
| parent | f19f639773e64289ed7345b8a1ea4dd244aa4882 (diff) | |
am f19f6397: Merge "edits to the lollipop highlights" into lmp-dev
* commit 'f19f639773e64289ed7345b8a1ea4dd244aa4882':
edits to the lollipop highlights
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions