diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-06-13 08:22:44 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2013-06-13 08:22:44 -0700 |
| commit | 026cba6c66677b6eb8ad6ac260dfd1bece07362d (patch) | |
| tree | 8457ee9e2c5bdabcacf01f5faced33b51dfa3a3e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7d1fd557a3fd96365565531e5e45ac5e93dd8315 (diff) | |
| parent | b44d66fa8e24e896291f923af2fa30ad87087b45 (diff) | |
| parent | 06420f2ecafb3e57f7c0d2669cc528e9df19f637 (diff) | |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Ic69db23c3b1ba493a97b162caa664759cf3b1bda