diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2013-07-30 10:28:35 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-30 10:28:35 -0700 |
commit | e7c9482015cafbd01bfa513e60f7ab45b48ce495 (patch) | |
tree | 2731b9f009e968d8eafe6eca8fa3f039483e9d92 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 997405be1935c12008998ea7230dd93309a4aa14 (diff) | |
parent | cc4bee55fa58193073f5ba5ccebc0cc24fdb45c7 (diff) |
am cc4bee55: am 8fcad020: Merge "Make legacy VPN work over stacked interfaces."
* commit 'cc4bee55fa58193073f5ba5ccebc0cc24fdb45c7':
Make legacy VPN work over stacked interfaces.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions