diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2013-05-11 09:54:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-11 09:54:45 -0700 |
| commit | 77a0c9d7bc664ac9b367da082fd5134b4ae653fe (patch) | |
| tree | 4b4f8ddc8228ab3369c295444203e151e48005fa /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ea47c0bd945502907a5c251fe5c8864d63884588 (diff) | |
| parent | b4fd1bd7748d2df00ec0792d3419aa79c742f979 (diff) | |
am b4fd1bd7: am de1361fa: Merge "P2P: Turn OFF PS-mode for DHCP session" into jb-mr2-dev
* commit 'b4fd1bd7748d2df00ec0792d3419aa79c742f979':
P2P: Turn OFF PS-mode for DHCP session
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions