Merge "Remove dead code 1." into lmp-dev

author Robert Greenwalt <rgreenwalt@google.com>

Mon, 28 Jul 2014 19:07:14 +0000 (19:07 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 24 Jul 2014 20:48:02 +0000 (20:48 +0000)
author Robert Greenwalt <rgreenwalt@google.com>
Mon, 28 Jul 2014 19:07:14 +0000 (19:07 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 24 Jul 2014 20:48:02 +0000 (20:48 +0000)
diff --cc services/core/java/com/android/server/ConnectivityService.java
Simple merge
author	Robert Greenwalt <rgreenwalt@google.com>
	Mon, 28 Jul 2014 19:07:14 +0000 (19:07 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 24 Jul 2014 20:48:02 +0000 (20:48 +0000)