summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorShri Borde <shri@google.com>2014-09-15 23:14:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-15 23:14:49 +0000
commit7ac5d6fccd373f9fb20a70fe83e6ee82a3680c69 (patch)
treecb4901630a8b2dfb63742bfc581724b95acf454d /api
parent2d360218b4145c7d4079a9266e1c70a47939080d (diff)
parentaa7c8c7bf612c3b6656989c2ec30a67f3bcb75e4 (diff)
downloadframeworks_base-7ac5d6fccd373f9fb20a70fe83e6ee82a3680c69.zip
frameworks_base-7ac5d6fccd373f9fb20a70fe83e6ee82a3680c69.tar.gz
frameworks_base-7ac5d6fccd373f9fb20a70fe83e6ee82a3680c69.tar.bz2
Merge "Unhide android.provider.Telephony.Sms.SUB_ID" into lmp-sprout-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 6653a49..211b957 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -25744,6 +25744,7 @@ package android.provider {
field public static final int STATUS_NONE = -1; // 0xffffffff
field public static final int STATUS_PENDING = 32; // 0x20
field public static final java.lang.String SUBJECT = "subject";
+ field public static final java.lang.String SUB_ID = "sub_id";
field public static final java.lang.String THREAD_ID = "thread_id";
field public static final java.lang.String TYPE = "type";
}