| commit | ee28612789cf372137d57cec15ecf09d8b5d6a41 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Sat Mar 08 21:09:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 08 21:09:20 2014 +0000 |
| tree | 35dedfc63bdf170d03f4302cbeb5f472083ec17b | |
| parent | c7705e6b5785c27fa830b6dda05984a595547b58 [diff] | |
| parent | 47c6bc4613aa83b6ed3576c438543ec6a0276215 [diff] |
am 47c6bc46: (-s ours) am 1750e12b: am ad21a1f6: (-s ours) Merge "Revert "DO NOT MERGE: Add generic IP packet code and use it for GRE."" into klp-dev * commit '47c6bc4613aa83b6ed3576c438543ec6a0276215': Revert "DO NOT MERGE: Add generic IP packet code and use it for GRE."