tree 2a5640e9e0d2ce0d1dba231e859d9947dd0cb780
parent a69b43bc7edc4b124aedc3fc8e36d78ce00856d3
parent 158aa4a98a19d572eb2b75283e181f54ee544787
author Android (Google) Code Review <android-gerrit@google.com> 1244830667 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1244830667 -0700

Merge change 3974 into donut

* changes:
  Integrate unsubmitted cupcake change 147342: 	CTS: clean up code in android.net package