| commit | c5844f87d53383d15b6e300b55654e703ba28e2e | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Oct 18 16:12:32 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 18 16:12:32 2013 -0700 |
| tree | 842f3f72a10ebd9c20a36d91d363b0616c9be3c3 | |
| parent | 0a45196c8e62444ca82cb69ec403947fc5e0c237 [diff] | |
| parent | c17e3bc6a241674869a4a619231c130bdf741449 [diff] |
am c17e3bc6: resolved conflicts for merge of fd498a07 to jb-mr1-dev * commit 'c17e3bc6a241674869a4a619231c130bdf741449': CTS test to check for unsanitized system() call in netd via setInterfaceThrottle.