summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-07-25 21:57:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-25 21:57:43 +0000
commitacaf686488d98087a4a571256a4bc3fea1271b9a (patch)
treee291c5f6a6650d760770fd2b2b8ce55e5d541850 /api
parente12a1259729c647c46023b34bc1aa2bbdee112dc (diff)
parent09002ed8674cb8ee8f034439d9e4c61d2b7b3e4f (diff)
downloadframeworks_base-acaf686488d98087a4a571256a4bc3fea1271b9a.zip
frameworks_base-acaf686488d98087a4a571256a4bc3fea1271b9a.tar.gz
frameworks_base-acaf686488d98087a4a571256a4bc3fea1271b9a.tar.bz2
am ff650115: am e120d1e5: am c8f3ac84: Merge "Update the value of PinnedPositions.UNPINNED to 0" into lmp-dev
* commit 'ff65011576f13cd28cafe6a83098b18bf66344db': Update the value of PinnedPositions.UNPINNED to 0
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index b1e3b16..63b6ba4 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -24848,7 +24848,7 @@ package android.provider {
ctor public ContactsContract.PinnedPositions();
field public static final int DEMOTED = -1; // 0xffffffff
field public static final java.lang.String UNDEMOTE_METHOD = "undemote";
- field public static final int UNPINNED = 2147483647; // 0x7fffffff
+ field public static final int UNPINNED = 0; // 0x0
}
public static final deprecated class ContactsContract.Presence extends android.provider.ContactsContract.StatusUpdates {