diff options
| author | Brian Attwell <brianattwell@google.com> | 2015-03-05 19:26:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-05 19:26:36 +0000 |
| commit | 54b804fa742e44a0bc7dccc2784b3322c7b92f19 (patch) | |
| tree | 904e3b13322ab7f7cb4655560e8834842e479ce6 /api | |
| parent | 47d740b92b631b1f69b63702f5edfc83538345cf (diff) | |
| parent | 643db51d4ec17575e6b830ae064be66f59450fae (diff) | |
| download | frameworks_base-54b804fa742e44a0bc7dccc2784b3322c7b92f19.zip frameworks_base-54b804fa742e44a0bc7dccc2784b3322c7b92f19.tar.gz frameworks_base-54b804fa742e44a0bc7dccc2784b3322c7b92f19.tar.bz2 | |
Merge "Prioritize regular names over phonetic names. P1"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 7a348ea..03e03c9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -24914,6 +24914,7 @@ package android.provider { field public static final int ORGANIZATION = 30; // 0x1e field public static final int PHONE = 20; // 0x14 field public static final int STRUCTURED_NAME = 40; // 0x28 + field public static final int STRUCTURED_PHONETIC_NAME = 37; // 0x25 field public static final int UNDEFINED = 0; // 0x0 } diff --git a/api/system-current.txt b/api/system-current.txt index 4755fe7..910d3d3 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -26514,6 +26514,7 @@ package android.provider { field public static final int ORGANIZATION = 30; // 0x1e field public static final int PHONE = 20; // 0x14 field public static final int STRUCTURED_NAME = 40; // 0x28 + field public static final int STRUCTURED_PHONETIC_NAME = 37; // 0x25 field public static final int UNDEFINED = 0; // 0x0 } |