| commit | 9aeafc87862e2209aab78bfd86b62c88fde25537 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 13 23:12:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 23:12:05 2014 +0000 |
| tree | aa5989bfe2d81abe2f40524b33ab1644af41817c | |
| parent | 6ecc81155cfde5cf07d0111b3a2532be1fac4139 [diff] | |
| parent | 1b1146be79ad58a52ca1ef84c4216039e054a024 [diff] |
am 1b1146be: resolved conflicts for merge of e22ed104 to klp-modular-dev-plus-aosp * commit '1b1146be79ad58a52ca1ef84c4216039e054a024': DO NOT MERGE: Support translating fragmented packets.