From 633177cbdc21b9e8f2153069965fb6aa30b8cb8f Mon Sep 17 00:00:00 2001
From: Evan Millar <emillar@google.com>
Date: Fri, 20 Nov 2009 13:38:58 -0800
Subject: [PATCH] Move updated 6.xml from eclair-sholes-release into eclair

bc_triaged bug: http://b/issue?id=2277456
Dr. No: Xav
---
 api/6.xml | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/api/6.xml b/api/6.xml
index 74c2375116186..a4103fdf005ea 100644
--- a/api/6.xml
+++ b/api/6.xml
@@ -6389,6 +6389,72 @@
  visibility="public"
 >
 </field>
+<field name="quickContactBadgeStyleSmallWindowLarge"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843443"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="quickContactBadgeStyleSmallWindowMedium"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843442"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="quickContactBadgeStyleSmallWindowSmall"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843441"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="quickContactBadgeStyleWindowLarge"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843440"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="quickContactBadgeStyleWindowMedium"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843439"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="quickContactBadgeStyleWindowSmall"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843438"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="radioButtonStyle"
  type="int"
  transient="false"
@@ -13804,6 +13870,8 @@
 </parameter>
 <parameter name="options" type="android.os.Bundle">
 </parameter>
+<exception name="NetworkErrorException" type="android.accounts.NetworkErrorException">
+</exception>
 </method>
 <method name="editProperties"
  return="android.os.Bundle"
@@ -13919,6 +13987,8 @@
 </parameter>
 <parameter name="loginOptions" type="android.os.Bundle">
 </parameter>
+<exception name="NetworkErrorException" type="android.accounts.NetworkErrorException">
+</exception>
 </method>
 </class>
 <class name="Account"