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

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

* commit 'c17e3bc6':
  CTS test to check for unsanitized system() call in netd via setInterfaceThrottle.
parents 0a45196c c17e3bc6
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