commit fb5bb7bb09673d727698f187d0133c5a3bbe4fcb
author The Android Automerger <android-build@google.com> Tue Oct 29 16:07:09 2013 -0700
committer The Android Automerger <android-build@google.com> Tue Oct 29 16:07:09 2013 -0700
tree e2de0db6febf82eed0671187a592c54e2a05d1ea
parent 6c22b7b05da5f559469e076309d40e35cd269f6a
parent 181bde092be1e5cee4f2a456341cb5cd25a59693

merge in klp-release history after reset to klp-dev

sdk/api-versions.xml

diff --git a/sdk/api-versions.xml b/sdk/api-versions.xml
index ceb405c..f9fa528 100644
--- a/sdk/api-versions.xml
+++ b/sdk/api-versions.xml
@@ -277,7 +277,6 @@
 		<field name="addPrintersActivity" since="19" />
 		<field name="addStatesFromChildren" />
 		<field name="adjustViewBounds" />
-		<field name="advancedPrintOptionsActivity" since="19" />
 		<field name="alertDialogIcon" since="11" />
 		<field name="alertDialogStyle" />
 		<field name="alertDialogTheme" since="11" />
@@ -19021,16 +19020,6 @@
 		<field name="STATE_QUEUED" />
 		<field name="STATE_STARTED" />
 	</class>
-	<class name="android/print/PrintJobInfo$Builder" since="19">
-		<extends name="java/lang/Object" />
-		<method name="&lt;init>(Landroid/print/PrintJobInfo;)V" />
-		<method name="build()Landroid/print/PrintJobInfo;" />
-		<method name="putAdvancedOption(Ljava/lang/String;I)V" />
-		<method name="putAdvancedOption(Ljava/lang/String;Ljava/lang/String;)V" />
-		<method name="setAttributes(Landroid/print/PrintAttributes;)V" />
-		<method name="setCopies(I)V" />
-		<method name="setPages([Landroid/print/PageRange;)V" />
-	</class>
 	<class name="android/print/PrintManager" since="19">
 		<extends name="java/lang/Object" />
 		<method name="&lt;init>()V" />
@@ -19109,13 +19098,10 @@
 		<method name="cancel()Z" />
 		<method name="complete()Z" />
 		<method name="fail(Ljava/lang/String;)Z" />
-		<method name="getAdvancedIntOption(Ljava/lang/String;)I" />
-		<method name="getAdvancedStringOption(Ljava/lang/String;)Ljava/lang/String;" />
 		<method name="getDocument()Landroid/printservice/PrintDocument;" />
 		<method name="getId()Landroid/print/PrintJobId;" />
 		<method name="getInfo()Landroid/print/PrintJobInfo;" />
 		<method name="getTag()Ljava/lang/String;" />
-		<method name="hasAdvancedOption(Ljava/lang/String;)Z" />
 		<method name="isBlocked()Z" />
 		<method name="isCancelled()Z" />
 		<method name="isCompleted()Z" />
@@ -19135,7 +19121,6 @@
 		<method name="onDisconnected()V" />
 		<method name="onPrintJobQueued(Landroid/printservice/PrintJob;)V" />
 		<method name="onRequestCancelPrintJob(Landroid/printservice/PrintJob;)V" />
-		<field name="EXTRA_PRINT_JOB_INFO" />
 		<field name="SERVICE_INTERFACE" />
 		<field name="SERVICE_META_DATA" />
 	</class>
@@ -26056,7 +26041,6 @@
 		<method name="equals(Landroid/util/DisplayMetrics;)Z" since="17" />
 		<method name="setTo(Landroid/util/DisplayMetrics;)V" />
 		<method name="setToDefaults()V" />
-		<field name="DENSITY_400" since="19" />
 		<field name="DENSITY_DEFAULT" since="4" />
 		<field name="DENSITY_HIGH" since="4" />
 		<field name="DENSITY_LOW" since="4" />