commit 1e41797d808018319b4513b28cd47f61f8f45395
author Stephen Hines <srhines@google.com> Thu May 30 21:09:02 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 30 21:09:03 2013 +0000
tree 8c4bfd1e860a76092573e4bfdc451e612c2628cb
parent e53044d9686be6b704ebb88c77e95f91956e67f9
parent 7d0b8f9396ff7fc262ae6abb42f996eb29727f90

Merge "Use hyphenated path for android-support-v8-renderscript." into jb-mr2-dev

api/18.txt

diff --git a/api/18.txt b/api/18.txt
index a9d0f57..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
@@ -11989,7 +11989,6 @@
     method public void start();
     method public void stop();
     method public void writeSampleData(int, java.nio.ByteBuffer, android.media.MediaCodec.BufferInfo);
-    field public static final int SAMPLE_FLAG_SYNC = 1; // 0x1
   }
 
   public static final class MediaMuxer.OutputFormat {