diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-07-19 13:33:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-19 13:33:46 -0700 |
| commit | 46cc4dbb38968dadffcc5f78dd69d391768711e1 (patch) | |
| tree | 330964d2304e782aabcebe5bab56bcc0e6b6a17b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b5bf655cc6cc9128aec99958cce3b054348c9273 (diff) | |
| parent | e0380d8fe675a1c1785cfd5d2b7f0c6b59c27c54 (diff) | |
am e0380d8f: resolved conflics for merge of 54201120 to jb-mr2-dev
* commit 'e0380d8fe675a1c1785cfd5d2b7f0c6b59c27c54':
Doc change: Add Colopl video to carousel and spotlight.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions