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