diff options
| author | Dan Sandler <dsandler@android.com> | 2015-08-16 02:36:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-16 02:36:17 +0000 |
| commit | 415c6cb2358a0ad4821ec58c287b1de94de78d72 (patch) | |
| tree | d552b246966d88646f1bd98e59124aae622936ab /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a5e012e6236aaeabd6d00fa7c6b29ec146ffd764 (diff) | |
| parent | 8c8387d235b780c4a78a54d8240fe1f5a17c6af5 (diff) | |
am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev
* commit '8c8387d235b780c4a78a54d8240fe1f5a17c6af5':
"I tried to think of the most harmless thing."
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions