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