commit | b3d38d834365a913614b22eea653488a178b7659 | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Tue Dec 09 23:22:58 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 09 23:22:58 2014 +0000 |
tree | aa3d0b82822c2fabef61de0b475a3c71932f117a | |
parent | 6057dd5fe66d53686990cf512f0c9fdbac0ca131 [diff] | |
parent | 400153fc8d1ae20a2fabec36e3144e7623f282d4 [diff] |
am 400153fc: resolved conflicts for merge of 6b2007aa to lmp-mr1-dev-plus-aosp * commit '400153fc8d1ae20a2fabec36e3144e7623f282d4': Move send_tun into tun.c as well.