diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-09-06 08:08:54 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2012-09-06 08:08:54 -0700 |
| commit | 1d9c5d8f18b7530c1e72fe86109707cddc198dbd (patch) | |
| tree | a6558a1a67c3972bbd74010c691794172595be13 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 342c6bc8e5edb5a0cfa2ad65162d559b7f2ad993 (diff) | |
| parent | 77bf72a5cd1b4ec70d9ef969db7d30c778a8303b (diff) | |
| parent | f63029b4990b962fb2f516eaace2dcb0f2faf9b2 (diff) | |
Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: I3ba16c8a37fd836c6c74dcfd1793f8bc1282b746