tree 6f9d1ac30b5c16bbb3a8590f939bff97530b6d7a
parent efee230fe16e5ca69c75a7385ed6fe07063620a5
parent b43e74bbce46f2f328e2031a7ae3447f415ef9ca
author Lorenzo Colitti <lorenzo@google.com> 1423104091 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423104091 +0000

am b43e74bb: am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration."

* commit 'b43e74bbce46f2f328e2031a7ae3447f415ef9ca':
  Add a unit test for StaticIpConfiguration.