commit c77f04f9bc61f6956ec8a6f498912cd0ffa8b7f8
author Lorenzo Colitti <lorenzo@google.com> Mon Mar 16 12:12:41 2015 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> Mon Mar 16 12:12:42 2015 +0000
tree 50da2cd00e87549402d39e6db44d86c364de6a79
parent 30d4ec6201ca242da338d0ce7c98be97b7526327
parent c8a0f49feecaf231e3f5972bd247dfbc586ccb34

Merge changes from topic 'dhcpclient' into m-wireless-dev

* changes:
  DHCP: Minor cleanups to the packet code.
  DHCP: Move the packet code to frameworks/base/services.
  DHCP: Add a native method for making a DHCP socket.
  DHCP: Add a superclass for DhcpStateMachine.

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index eb2df0b..3b0d567 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -2370,7 +2370,7 @@
      * successfully finding a network for the applications request.  Retrieve it with
      * {@link android.content.Intent#getParcelableExtra(String)}.
      * <p>
-     * Note that if you intend to invoke (@link #setProcessDefaultNetwork(Network)) or
+     * Note that if you intend to invoke {@link #setProcessDefaultNetwork} or
      * {@link Network#openConnection(java.net.URL)} then you must get a
      * ConnectivityManager instance before doing so.
      */