diff options
| author | James Kelly <jfkelly@google.com> | 2013-09-18 18:07:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-18 18:07:02 -0700 |
| commit | 1f8cf09c53c72d26ca67974d1b7e51112be4a170 (patch) | |
| tree | 7579459435ce2eac8dacd9167530b47e50bd3915 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a621cfe84fcdab3b4e956148203be66e158316da (diff) | |
| parent | 2815bb05a042975b282f7131514368aa89cf0dd4 (diff) | |
am 2815bb05: am 48c6b573: Merge "more string changes for wi-fi trademark compliance" into jb-mr2-docs
* commit '2815bb05a042975b282f7131514368aa89cf0dd4':
more string changes for wi-fi trademark compliance
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions