Commit 986da910 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am acb7e0e2: am c5844f87: am c17e3bc6: resolved conflicts for merge of fd498a07 to jb-mr1-dev 

* commit 'acb7e0e2':
  CTS test to check for unsanitized system() call in netd via setInterfaceThrottle.
parents 4fe76737 acb7e0e2
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment