diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-06-25 16:12:06 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2013-06-25 16:12:06 -0700 |
| commit | bfc53ab2def0d58872b70e7f4afb2ca184143ff6 (patch) | |
| tree | d2dee972cbda6f391d6f06e97cc805f26a8bfde4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 52dbdbf2d10f4e53f76c40a0bed0ffe31301f1f0 (diff) | |
| parent | 8d41901e6669b5916f4fcbbf262445ca906e1556 (diff) | |
| parent | 2184e3e31be584b93b4c74413b3d654c3b7f3499 (diff) | |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I9db90765647d0218de569565d7a23ab3c12ca044