tree 42d284d49966f15673f96895345e59406a121258
parent af0e838887d3a2fa76e0d2716e39adf2bb0c01a1
parent 525777a870707a50a8c75f38286acad48459767c
author Android (Google) Code Review <android-gerrit@google.com> 1251493275 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1251493275 -0700

Merge change 22992 into eclair

* changes:
  Annotate tests that are failing due to legacy IP address formats that have not been implemented yet.