diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-07-19 14:22:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-19 14:22:06 -0700 |
| commit | 2289382cfa07535b52db114ed3dc5a95c7fd63ce (patch) | |
| tree | 95bf17f47b337d195308b4366a60a3d85d1d7710 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 538cdb98ef06a1768c582df28e8cc0e4335dd216 (diff) | |
| parent | 64127efbe65f73a01cf15366e08406bf7cb537d9 (diff) | |
am 64127efb: am 46cc4dbb: am e0380d8f: resolved conflics for merge of 54201120 to jb-mr2-dev
* commit '64127efbe65f73a01cf15366e08406bf7cb537d9':
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