| commit | 47c6bc4613aa83b6ed3576c438543ec6a0276215 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Sat Mar 08 21:03:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 08 21:03:43 2014 +0000 |
| tree | 35dedfc63bdf170d03f4302cbeb5f472083ec17b | |
| parent | 3ebf4b23e0080b24c6376cd481a4da9d57d001a4 [diff] | |
| parent | 1750e12b7d5a9ce9fd916130cd11a4ddf0c0237d [diff] |
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 '1750e12b7d5a9ce9fd916130cd11a4ddf0c0237d': Revert "DO NOT MERGE: Add generic IP packet code and use it for GRE."