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