| commit | caeed6fcfcd4c281603b0ac3b51185afeb2dac71 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Sat Mar 08 20:24:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 08 20:24:59 2014 +0000 |
| tree | 35dedfc63bdf170d03f4302cbeb5f472083ec17b | |
| parent | 829afae04aefc94dab77a942387762f1684e1909 [diff] | |
| parent | b568c280271204f8eeaec386f1e0da169115e0b9 [diff] |
am b568c280: (-s ours) am 1c6516fc: am f10644ce: (-s ours) DO NOT MERGE: Add generic IP packet code and use it for GRE. * commit 'b568c280271204f8eeaec386f1e0da169115e0b9': DO NOT MERGE: Add generic IP packet code and use it for GRE.