diff --git a/api/current.xml b/api/current.xml
index c98a5c4a7f3de..ebbdf39de0d11 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -2081,7 +2081,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843393"
+ value="16843392"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -2323,7 +2323,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843392"
+ value="16843391"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -3518,6 +3518,17 @@
  visibility="public"
 >
 </field>
+<field name="donut_resource_pad30"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843394"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="donut_resource_pad4"
  type="int"
  transient="false"
@@ -3885,7 +3896,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843390"
+ value="16843389"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4028,7 +4039,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843391"
+ value="16843390"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4380,7 +4391,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843389"
+ value="16843388"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4391,7 +4402,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843387"
+ value="16843386"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4402,7 +4413,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843388"
+ value="16843387"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4413,7 +4424,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843386"
+ value="16843385"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4431,22 +4442,11 @@
  visibility="public"
 >
 </field>
-<field name="gestures"
- type="int"
- transient="false"
- volatile="false"
- value="16843385"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="glEsVersion"
  type="int"
  transient="false"
  volatile="false"
- value="16843394"
+ value="16843393"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -47782,132 +47782,6 @@
  visibility=""
 >
 </class>
-<class name="LetterRecognizer"
- extends="java.lang.Object"
- abstract="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<method name="recognize"
- return="java.util.ArrayList&lt;android.gesture.Prediction&gt;"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="gesture" type="android.gesture.Gesture">
-</parameter>
-</method>
-<method name="recognize"
- return="java.util.ArrayList&lt;android.gesture.Prediction&gt;"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="gesture" type="android.gesture.Gesture">
-</parameter>
-<parameter name="predictions" type="java.util.ArrayList&lt;android.gesture.Prediction&gt;">
-</parameter>
-</method>
-</class>
-<class name="LetterRecognizers"
- extends="java.lang.Object"
- abstract="false"
- static="false"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-<method name="fromFile"
- return="android.gesture.LetterRecognizer"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="path" type="java.lang.String">
-</parameter>
-</method>
-<method name="fromFile"
- return="android.gesture.LetterRecognizer"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="file" type="java.io.File">
-</parameter>
-</method>
-<method name="fromResource"
- return="android.gesture.LetterRecognizer"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="context" type="android.content.Context">
-</parameter>
-<parameter name="resourceId" type="int">
-</parameter>
-</method>
-<method name="fromStream"
- return="android.gesture.LetterRecognizer"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="stream" type="java.io.InputStream">
-</parameter>
-</method>
-<method name="fromType"
- return="android.gesture.LetterRecognizer"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="context" type="android.content.Context">
-</parameter>
-<parameter name="type" type="int">
-</parameter>
-</method>
-<field name="RECOGNIZER_LATIN_LOWERCASE"
- type="int"
- transient="false"
- volatile="false"
- value="0"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-</class>
 <class name="OrientedBoundingBox"
  extends="java.lang.Object"
  abstract="false"
@@ -160404,17 +160278,6 @@
  visibility="public"
 >
 </method>
-<method name="getGestures"
- return="int"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
 <method name="getListPaddingBottom"
  return="int"
  abstract="false"
@@ -160788,19 +160651,6 @@
 <parameter name="filterText" type="java.lang.String">
 </parameter>
 </method>
-<method name="setGestures"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="gestures" type="int">
-</parameter>
-</method>
 <method name="setOnScrollListener"
  return="void"
  abstract="false"
@@ -160946,39 +160796,6 @@
 <parameter name="dr" type="android.graphics.drawable.Drawable">
 </parameter>
 </method>
-<field name="GESTURES_FILTER"
- type="int"
- transient="false"
- volatile="false"
- value="2"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="GESTURES_JUMP"
- type="int"
- transient="false"
- volatile="false"
- value="1"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="GESTURES_NONE"
- type="int"
- transient="false"
- volatile="false"
- value="0"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="TRANSCRIPT_MODE_ALWAYS_SCROLL"
  type="int"
  transient="false"
diff --git a/core/java/android/gesture/GestureStore.java b/core/java/android/gesture/GestureStore.java
index ddf1c8330b171..7251198949bff 100644
--- a/core/java/android/gesture/GestureStore.java
+++ b/core/java/android/gesture/GestureStore.java
@@ -228,8 +228,8 @@ public class GestureStore {
 
             final HashMap<String, ArrayList<Gesture>> maps = mNamedGestures;
 
-            out = new DataOutputStream((stream instanceof BufferedOutputStream) ? out :
-                    new BufferedOutputStream(out, GestureConstants.IO_BUFFER_SIZE));
+            out = new DataOutputStream((stream instanceof BufferedOutputStream) ? stream :
+                    new BufferedOutputStream(stream, GestureConstants.IO_BUFFER_SIZE));
             // Write version number
             out.writeShort(FILE_FORMAT_VERSION);
             // Write number of entries