tree 6b854d0d24eaab8a11a74e4b94699f77f8fbe71f
parent 06bd5e2d0ade82b9fc70fd8928c1746ca529a2f4
parent c71483c0b38a6b4f2675f0bffa221dcf175c34ac
author Lorenzo Colitti <lorenzo@google.com> 1410259343 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410259343 +0000

am c71483c0: Merge "When comparing DNS server configs, also compare number of servers"

* commit 'c71483c0b38a6b4f2675f0bffa221dcf175c34ac':
  When comparing DNS server configs, also compare number of servers