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