diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-07-03 08:51:10 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2013-07-03 08:51:11 -0700 |
| commit | 48de2c723dfecabc40a86fe70c6ea4821884e8b3 (patch) | |
| tree | cbbb26564e0d10dad2ed68e0bf5a6c35295730c1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6ea2faf8ca7e1d7f75e41c9b13d36fa47436e1cc (diff) | |
| parent | 58101e218cb014322798fe18e4ef5f08395f9a30 (diff) | |
| parent | 18a46a26a0a6a1535da4c342a82d0bb555efd3e8 (diff) | |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I343bd8f6d948c90cd5cede9dc160c86ebce6501c