| commit | 46f0832b7a91b5013e84d0debeec46b1ef48c812 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Mon Mar 10 10:25:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 10 10:25:04 2014 +0000 |
| tree | adec6802b8d7d1632460ed220a70ea46cd5b8830 | |
| parent | 47c8bf17870521ab475d5bcd6275d5016d444e15 [diff] | |
| parent | ad21a1f63cbc6a0ef5d207c4bab38171bfcecd76 [diff] |
am ad21a1f6: Merge "Revert "DO NOT MERGE: Add generic IP packet code and use it for GRE."" into klp-dev * commit 'ad21a1f63cbc6a0ef5d207c4bab38171bfcecd76': Revert "DO NOT MERGE: Add generic IP packet code and use it for GRE."