commit 4e4fec1b8d657e32fa7a66c20c7c6a27ad96a089
author Etan Cohen <etancohen@google.com> Sat Apr 25 01:08:10 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 25 01:08:11 2015 +0000
tree 6c1f5e2e05a9a808c01506539be77d3ed46962fc
parent 49314cea50ed8bbb1cc3621c79ff9466bc642a23
parent 237a59767d4c38b4b69fcc2a9b9d88cad5c5e97e

Merge "Fix documentation - non-public API."

core/java/android/bluetooth/BluetoothAdapter.java

diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java
index d4e79be..3044a94 100644
--- a/core/java/android/bluetooth/BluetoothAdapter.java
+++ b/core/java/android/bluetooth/BluetoothAdapter.java
@@ -121,9 +121,6 @@
      * {@link #STATE_TURNING_ON},
      * {@link #STATE_ON},
      * {@link #STATE_TURNING_OFF},
-     * {@link #STATE_BLE_TURNING_ON},
-     * {@link #STATE_BLE_ON},
-     * {@link #STATE_BLE_TURNING_OFF},
      */
     public static final String EXTRA_STATE =
             "android.bluetooth.adapter.extra.STATE";

telecomm/java/android/telecom/InCallService.java

diff --git a/telecomm/java/android/telecom/InCallService.java b/telecomm/java/android/telecom/InCallService.java
index e5d6ae0..caa1731 100644
--- a/telecomm/java/android/telecom/InCallService.java
+++ b/telecomm/java/android/telecom/InCallService.java
@@ -370,7 +370,7 @@
         public abstract void registerCallback(VideoCall.Callback callback);
 
         /**
-         * Clears the video call listener set via {@link #setVideoCallListener(Listener)}.
+         * Clears the video call listener set via {@link #registerCallback(callback)}.
          */
         public abstract void unregisterCallback();