commit 30a2f7422297f530565ec5ae274efbea967739e3
author Jean-Baptiste Queru <jbq@google.com> Tue Apr 24 13:57:12 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 24 13:57:12 2012 -0700
tree cfe2aee294d19e5dd4a18e01e7c9928b13e6119a
parent 53fd8e84c701048d4d30bb885656eab334a4e772
parent 75b1c3011be727acbc862d6684299709756a33bd

am 75b1c301: am ed11920c: am 60247737: Merge "Fix build - re-generate current.txt"

* commit '75b1c3011be727acbc862d6684299709756a33bd':
  Fix build - re-generate current.txt

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 2025aa7..621d0a3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -417,7 +417,7 @@
     field public static final int editorExtras = 16843300; // 0x1010224
     field public static final int ellipsize = 16842923; // 0x10100ab
     field public static final int ems = 16843096; // 0x1010158
-    field public static final deprecated int enabled = 16842766; // 0x101000e
+    field public static final int enabled = 16842766; // 0x101000e
     field public static final int endColor = 16843166; // 0x101019e
     field public static final deprecated int endYear = 16843133; // 0x101017d
     field public static final int enterFadeDuration = 16843532; // 0x101030c