commit 4cfe984af1001ddb460b5507966f786efd2ece55
author Scott Main <smain@google.com> Tue Jan 21 19:32:51 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 21 19:32:51 2014 +0000
tree acdf251cae82c4142016286056c7073a5bc55f24
parent 6d4e89c7ee0f62c5c2b6352db54bdbe09cd23a71
parent 2ca9c14f74b75227942d2802292765c952f42f4f

am 2ca9c14f: am a0929c93: am 26a1d55d: fix mistake from previous changes for public enums. This fixes the "since API level" information in the javadocs. The enums deleted here were actually added in much later versions.

* commit '2ca9c14f74b75227942d2802292765c952f42f4f':
  fix mistake from previous changes for public enums. This fixes the "since API level" information in the javadocs. The enums deleted here were actually added in much later versions.

api/1.xml

diff --git a/api/1.xml b/api/1.xml
index 4ff4954..c0eac53 100644
--- a/api/1.xml
+++ b/api/1.xml
@@ -61024,26 +61024,6 @@
  visibility="public"
 >
 </field>
-<field name="BLOCKED"
- type="android.net.NetworkInfo.DetailedState"
- transient="false"
- volatile="false"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="CAPTIVE_PORTAL_CHECK"
- type="android.net.NetworkInfo.DetailedState"
- transient="false"
- volatile="false"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="CONNECTED"
  type="android.net.NetworkInfo.DetailedState"
  transient="false"
@@ -61134,16 +61114,6 @@
  visibility="public"
 >
 </field>
-<field name="VERIFYING_POOR_LINK"
- type="android.net.NetworkInfo.DetailedState"
- transient="false"
- volatile="false"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <method name="valueOf"
  return="android.net.NetworkInfo.DetailedState"
  abstract="false"