Commit 1fb98e86 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 15e12931: (-s ours) Reconcile with jb-mr2-release - do not merge 

* commit '15e12931':
  DO NOT MERGE - remove dns test from MR2
parents ee3927be 15e12931
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