| commit | 441230ee5592512fe517fa62b37576653f1b3a2a | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Oct 18 16:34:15 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 18 16:34:15 2013 -0700 |
| tree | 0a6bb2ba78fb0af95501d30aada62d644159e2d9 | |
| parent | 96e5768aa29d9bee821c9208f9654f821a8ed1b9 [diff] | |
| parent | 4f894feb48f1e5d63e00932b69d8d6bc986698c4 [diff] |
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 '4f894feb48f1e5d63e00932b69d8d6bc986698c4': CTS test to check for unsanitized system() call in netd via setInterfaceThrottle.