commit e53044d9686be6b704ebb88c77e95f91956e67f9
author Lajos Molnar <lajos@google.com> Wed May 29 19:11:53 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 29 19:11:53 2013 +0000
tree b996b95afcc7876c8420c47c29ae16e74d3dbc2d
parent 5c06681ea4783e7284e9adec7d7c8f338ef263d8
parent 3b786a962c4af01911c7dac01d2230c636257c37

Merge "media.MediaMuxer: remove unused SAMPLE_FLAG_SYNC flag." into jb-mr2-dev

api/18.txt

diff --git a/api/18.txt b/api/18.txt
index 942cd57..9eef734 100644
--- a/api/18.txt
+++ b/api/18.txt
@@ -4923,7 +4923,7 @@
     method public boolean setCharacteristicNotification(android.bluetooth.BluetoothGattCharacteristic, boolean);
     method public boolean writeCharacteristic(android.bluetooth.BluetoothGattCharacteristic);
     method public boolean writeDescriptor(android.bluetooth.BluetoothGattDescriptor);
-    field public static final int GATT_FAILURE = 0; // 0x0
+    field public static final int GATT_FAILURE = 257; // 0x101
     field public static final int GATT_INSUFFICIENT_AUTHENTICATION = 5; // 0x5
     field public static final int GATT_INSUFFICIENT_ENCRYPTION = 15; // 0xf
     field public static final int GATT_INVALID_ATTRIBUTE_LENGTH = 13; // 0xd