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