From d609ca7f6a48f32dcd6671f877a96e8bf1b898ed Mon Sep 17 00:00:00 2001
From: James Dong <jdong@google.com>
Date: Wed, 22 Dec 2010 10:32:51 -0800
Subject: Expose AMRNB/WB and AAC encoder and related file output formats - do
 not merge

bug - 3305667

Change-Id: I8f137af7f87cb010f75cae1777b9ec6b6af8214f
---
 api/current.xml | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

(limited to 'api/current.xml')

diff --git a/api/current.xml b/api/current.xml
index e98733567e00..f0aebeb95f7f 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -87206,6 +87206,17 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<field name="AAC"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="3"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="AMR_NB"
  type="int"
  transient="false"
@@ -87217,6 +87228,17 @@
  visibility="public"
 >
 </field>
+<field name="AMR_WB"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="2"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="DEFAULT"
  type="int"
  transient="false"
@@ -87373,6 +87395,28 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<field name="AMR_NB"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="3"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="AMR_WB"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="4"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="DEFAULT"
  type="int"
  transient="false"
@@ -224703,7 +224747,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="t" type="T">
+<parameter name="arg0" type="T">
 </parameter>
 </method>
 </interface>
-- 
cgit v1.2.3-59-g8ed1b