diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-06-11 14:56:51 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2013-06-11 14:56:52 -0700 |
| commit | 799f031a64d3930b85b9232bac344b1f9f216717 (patch) | |
| tree | b90bf9bb91032cf8493212b7e9adb860e2278469 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4a9fcaf49f6da3f28334bb8e5eddea51c0b6fc59 (diff) | |
| parent | 45bd14ffb2906265a39e11dcce5f42c80b6cb519 (diff) | |
| parent | 257cc10c951304658fa7427c801b40710711d14f (diff) | |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I7100db02d39d7d91bb3c2b8eea070a48a8f7c139