| commit | 1750e12b7d5a9ce9fd916130cd11a4ddf0c0237d | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Sat Mar 08 21:01:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 08 21:01:23 2014 +0000 |
| tree | 90688df2eaee12c089b54cf55ec9aeb40313bfeb | |
| parent | 191c472e6c98446cde8169533c7b3804728c1011 [diff] | |
| parent | ad21a1f63cbc6a0ef5d207c4bab38171bfcecd76 [diff] |
am ad21a1f6: (-s ours) 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."