commit | 85ce650592fb5e832f56642714bb5866d6eb2f05 | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Fri Jun 13 10:07:50 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 13 10:07:50 2014 +0000 |
tree | f116d25c71edea06af35c72f9fe1d48a370d0589 | |
parent | 90bc01fbdbcf896df99d1801a98033a9be1d87fb [diff] | |
parent | d3edb2776e549f0952332055401ab4c5d743695c [diff] |
am d3edb277: (-s ours) am e24982ea: Make translate_packet take a fd instead of a tun header. * commit 'd3edb2776e549f0952332055401ab4c5d743695c': Make translate_packet take a fd instead of a tun header.