| commit | b761e1de9d6c07ec88f55ae94b7e2de04c7977f1 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Oct 18 16:31:04 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 18 16:31:04 2013 -0700 |
| tree | 8fbabed07cfe715dc75ba131e1ee4550d64b731b | |
| parent | 7bd30bc209c1cc8053af0a1216518dd16c7f5cf7 [diff] | |
| parent | daafe2e9da2465e8260e4a89d28dec3509f9421c [diff] |
am daafe2e9: am 986da910: am acb7e0e2: am c5844f87: am c17e3bc6: resolved conflicts for merge of fd498a07 to jb-mr1-dev * commit 'daafe2e9da2465e8260e4a89d28dec3509f9421c': CTS test to check for unsanitized system() call in netd via setInterfaceThrottle.