| commit | e9e6a661ce5d5168a7b80e35dac66cbb6d04239f | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Aug 27 14:13:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:13:37 2015 +0000 |
| tree | 09a2890601969ad16f86bb6491e25fefb3a584a1 | |
| parent | 86e92a54be0d07a8c05bb88b89da7ea4eb8176f0 [diff] | |
| parent | 3dad54a15e5719f6e2e5c70871943616c1df0a04 [diff] |
am 3dad54a1: am a41cf02b: (-s ours) am 53b5e80f: Merge "extensions: libxt_socket: add --restore-skmark option" * commit '3dad54a15e5719f6e2e5c70871943616c1df0a04':