diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-12-04 15:16:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 15:16:37 +0000 |
| commit | c16d1448bb139384cc86d14d9412ffe1a62817c8 (patch) | |
| tree | 6257a15f70890548b52bdd570e5b40fe0afc109b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 92a4627250d74264719eff3ade798a9f4480ed5a (diff) | |
| parent | b2ded18a84b3b23a76b462644dcd24b3c33f5234 (diff) | |
am b2ded18a: Merge "resolved conflicts for merge of fb30a783 to lmp-mr1-dev" into lmp-mr1-dev
* commit 'b2ded18a84b3b23a76b462644dcd24b3c33f5234':
Fix typos in previous bugfixes.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions