diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-07-19 13:37:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-19 13:37:44 -0700 |
| commit | 64127efbe65f73a01cf15366e08406bf7cb537d9 (patch) | |
| tree | cbd1973b08b3d0f02530c35fac387deb3f44bf0f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 85b5e4c48f8e81f420286e0c5ebfb5617dd8f6b9 (diff) | |
| parent | 46cc4dbb38968dadffcc5f78dd69d391768711e1 (diff) | |
am 46cc4dbb: am e0380d8f: resolved conflics for merge of 54201120 to jb-mr2-dev
* commit '46cc4dbb38968dadffcc5f78dd69d391768711e1':
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