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