| commit | 6cb1e2b1aa44c0439bc0df7f14669caeb2dbad9b | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Oct 18 16:36:44 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 18 16:36:44 2013 -0700 |
| tree | 8bd344880f91f4e99789be940e08b28c3934c4e4 | |
| parent | 4459563384c4a117b59fdc95dabfb1c65b8bc96a [diff] | |
| parent | 441230ee5592512fe517fa62b37576653f1b3a2a [diff] |
am 441230ee: am 4f894feb: am b761e1de: am daafe2e9: am 986da910: am acb7e0e2: am c5844f87: am c17e3bc6: resolved conflicts for merge of fd498a07 to jb-mr1-dev * commit '441230ee5592512fe517fa62b37576653f1b3a2a': CTS test to check for unsanitized system() call in netd via setInterfaceThrottle.