diff options
| author | Scott Main <smain@google.com> | 2013-09-04 09:18:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-04 09:18:23 -0700 |
| commit | ca0d88b841db52fc926027f412003a8bf6efdf39 (patch) | |
| tree | 66b5a8cb7ca632fbf90ef15cc4d6de6b75acae68 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e0718c044bc81db0334f2973b9884b968c18ce07 (diff) | |
| parent | c3adcf9dc745932bf3a059a7201644dd96b97750 (diff) | |
am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs
* commit 'c3adcf9dc745932bf3a059a7201644dd96b97750':
replace instances of Wi-Fi Direct with Wi-Fi P2P
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions