diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-05-01 11:31:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-01 11:31:41 -0700 |
| commit | a49cea63a080b7c5f884626ba3c0309cb6e49f99 (patch) | |
| tree | 19ad5b5d35d8df937b6fd2fa2a69aa81c6855446 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 334c04e2f0eb62c6c9db73da0ec0021abffceb92 (diff) | |
| parent | 033168b1b0e6fc24a01bef6ec65948663f0ad3b7 (diff) | |
am 033168b1: Merge "Lockdown VPN handles its own connection teardown." into jb-mr2-dev
* commit '033168b1b0e6fc24a01bef6ec65948663f0ad3b7':
Lockdown VPN handles its own connection teardown.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions