Squashed commit of the following:

commit 4a1ade1e8e86f8f8d2f47fce809e0b5e64735c2d
Author: Chiao Cheng <chiaocheng@google.com>
Date:   Mon Jul 8 17:56:47 2013 -0700

    White list file names and do not allow ".."

    Fixes security vulnerability where application can pass in relative file paths
    with ".." in the string to access files outside of the dumpedfiles directory.

    Bug: 9607306
    Change-Id: Iad219cb48fa560d837498c2dc75127294dcf401b

commit 3f88ff6b537fb53806f126b4aea3355686387717
Merge: ef5fa9a 4a73266
Author: Chiao Cheng <chiaocheng@google.com>
Date:   Mon May 13 18:42:38 2013 +0000

    Merge "Fix method not found errors for unit test." into jb-mr2-dev

commit 4a732664f285ebe3dcd495c5e94d4043ebd59dcb
Author: Chiao Cheng <chiaocheng@google.com>
Date:   Thu May 9 16:22:25 2013 -0700

    Fix method not found errors for unit test.

    Two methods in MoreDatabaseUtils are no longer used after a recent bug
    fix. But the tests for them are erroring out in userdebug builds because
    proguard is stripping the methods.

    Bug: 8894559
    Change-Id: Idc2b4c9fd2fd6b58a3c44e5a40dec1b1c582cd2e

commit ef5fa9a68690d19e2a9c9748d63e2cabb5075813
Author: Jay Shrauner <shrauner@google.com>
Date:   Thu May 9 15:56:21 2013 -0700

    Fix CommitProcessor unittest

    Fix createRawContact() call that was missed in update to call semantics.

    Bug:8894174
    Change-Id: Ib52ec9add1c6c829b359d6faebff416b81afca2a

commit da51adb4b99894666e7ea91fed0e8afc94162333
Author: Chiao Cheng <chiaocheng@google.com>
Date:   Tue Apr 23 14:39:19 2013 -0700

    Fixed issue where some contacts are not added to delete log.

    Contacts with multiple raw contacts were not being inserted into the delete
    log when accounts are removed.  This was due to the raw contacts being removed
    in batch instead of one at a time. The logic to determine whether a contact
    can be deleted was determining whether other raw contacts exist.  This does
    not work when all raw contacts are removed in a single batch.

    Added logic to pre-select contacts that will be deleted.

    Bug: 8696462
    Change-Id: I95adccf9e6756bbf6ca9dd7d144c1d9ee8905631

commit 0cc5d1504803de51f8b421442e04ece87728af43
Author: Chiao Cheng <chiaocheng@google.com>
Date:   Mon Apr 22 13:26:05 2013 -0700

    Fix sqlite error when too many bind variables.

    Sqlite has a limit of 999 bind variables by default.  Since there is no risk
    of sql injection in this method, change to building sql by concatentation.

    Bug: 8676489
    Change-Id: I9bfea735bb14fd65c84eb4255825b7ad3f5fae71

commit a62622b31107f97be7da9a4b79393e465b64fd36
Author: Chiao Cheng <chiaocheng@google.com>
Date:   Thu Apr 18 12:27:01 2013 -0700

    Fixing delta api for account removal case.

    Account removal uses a different code path from normal contact deletes.  This
    patch properly adds deleted contacts into the delete log when an account is
    removed.  Also updates contact last updated timestamp for the non-delete case
    when a raw contact is removed from an aggregate contact.

    Bug: 8654272
    Change-Id: I05c3ef297e5ad2ca6713e06d0b40206876cf0b9e

commit 9aec6b8422f8d153a91a241f1b10d6e48d338bb8
Author: Chiao Cheng <chiaocheng@google.com>
Date:   Wed Apr 10 11:23:59 2013 -0700

    Fix broken build.

    Missed two methods during a refactor.  Updating new class prefixes for them.

    Bug: 8182147
    Change-Id: If3476adf043f2192b53bfaa9fc03c8149a181005

commit 8ed367fdc0b086d54c489f68d555e2f0a4035f63
Author: Chiao Cheng <chiaocheng@google.com>
Date:   Tue Mar 12 14:06:09 2013 -0700

    Adding contacts delta api.

    Updates and inserts can be detected through the use of a new timestamp
    field in the contacts table.

    Deletes can be detected by querying the new deleted_contacts table.

    Bug: 8182147
    Change-Id: I5c1e596f4e1aa58528afc29396f79cb4051e229c

commit 0c70f1701e264a0e79a14884f8396d2a2e4caacf
Merge: 0f4b7a9 216c434
Author: Yorke Lee <yorkelee@google.com>
Date:   Fri Apr 5 21:27:08 2013 +0000

    Merge "Provider side changes for exposing data usage stats" into jb-mr2-dev

commit 216c434537d05a691add4e22ba3a9d958c976c1e
Author: Yorke Lee <yorkelee@google.com>
Date:   Fri Mar 29 12:09:12 2013 -0700

    Provider side changes for exposing data usage stats

    Use a uri query parameter to filter for a specific type of data usage,
    otherwise the sum of all the data usage stats for that particular
    data is returned.

    Bug 8124079

    Change-Id: Iee4c3accb46c9402f0a1659c9b8943c5a219a169

commit 0f4b7a9bfe4b2079a7c5bb22b4114b5672639b05
Author: Jay Shrauner <shrauner@google.com>
Date:   Mon Mar 18 11:41:28 2013 -0700

    Japanese and Chinese search key fixes

    Change so Pinyin search keys are only generated when in a simplified
    Chinese locale. Fix name style classification of phonetic names.
    Generate Romaji search keys for Japanese phonetic names. Add
    secondary locale labeling for a number of non-Western languages
    (Japanese, Korean, Thai, Arabic, Hebrew, Greek, Cyrillic).

    Bug:5356921
    Change-Id: I8c3a6b67d59fbd6b7b16e4e9f69bc30d1d996a75

commit 8f8b122c7556350d94c2e349b3093024b0205d8d
Author: Yorke Lee <yorkelee@google.com>
Date:   Thu Mar 7 16:13:07 2013 -0800

    Add new apis to CP2

    Add Data.Contactables.CONTENT_URI and CONTENT_FILTER_URI
    Querying against these uris return email addresses and phone numbers
    belonging to all contacts with email/address/names that match the filter
    (if provided).
    Add VISIBLE_CONTACTS_ONLY boolean parameters to Data

    Bug: 8123918

    Change-Id: I491cb2ff4c64c9d042d5e21cebc5f90d086c70ac

commit f9d266baf36f7c5d8c4d301f0d72c47fc40bedbe
Author: Kareem Nassar <knassar@google.com>
Date:   Tue Mar 19 18:03:55 2013 -0700

    Adding READ_WRITE_ALL_VOICEMAIL to ContactsProvider.

    Bug: 8391996
    Change-Id: Ib3dfcb8e55c5f139f01949af1a54b1dfaa1f66ce

commit aa63bdfc1fe2fe3ed6d00e2243c9e6b57fcbb3f6
Author: Kareem Nassar <knassar@google.com>
Date:   Tue Mar 19 13:22:00 2013 -0700

    Using permission ADD_VOICEMAIL in ContactsProvider.

    Bug: 8391996
    Change-Id: Ife73f6d4aeb9291a3df970150b7054cd89e7c8d2

commit b966c4dda3ea100a70abd095b00888b9294bfae8
Author: Justin Koh <justinkoh@google.com>
Date:   Fri Mar 15 16:04:45 2013 -0700

    Add READ_SYNC_SETTINGS permission to ContactsProvider.

    Add READ_SYNC_SETTINGS permission to ContactsProvider. This was getting
    grandfathered on devices which also ship Contacts, but for devices that don't,
    it crashes.

    Bug: 8392652
    Change-Id: Ifbafb863f64cf3c9296fc0d7abd37e6270fd206e

commit 016d2f04b46a45e8ebd105f22814adf6e6ad57fd
Merge: b3ba143 1f8895b
Author: Jay Shrauner <shrauner@google.com>
Date:   Mon Mar 11 21:00:36 2013 +0000

    Merge "Fix unit tests for ICU 51 patches" into jb-mr2-dev

commit 1f8895bc9efd6c20adb02652bccb2c011ebca114
Author: Jay Shrauner <shrauner@google.com>
Date:   Mon Mar 4 10:37:38 2013 -0800

    Fix unit tests for ICU 51 patches

    Fix unit tests to reflect fixes to AlphabeticIndex from backporting
    ICU 51 fixes into current Android ICU drop. Add tests for new German
    "Sch" and "St" labels.

    Bug:
    Change-Id: I9c4778bec24eebe6ed4228d541b6a6d95c6701aa

commit b3ba1435441188ca2ce4802a754d2255f1aa5e98
Merge: 70c9e28 2c684ac
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 13:44:42 2013 -0700

    am 2c684aca: am 44e6d244: am 1f170438: (-s ours) am 17d6b4c1: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '2c684acab5810cf55780457bda7e5c8895ed1037':

commit 2c684acab5810cf55780457bda7e5c8895ed1037
Merge: 75a0a0b 44e6d24
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 13:13:52 2013 -0700

    am 44e6d244: am 1f170438: (-s ours) am 17d6b4c1: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '44e6d244fa7b7fb39b4488f6b8e54e3b6bb6e605':

commit 44e6d244fa7b7fb39b4488f6b8e54e3b6bb6e605
Merge: dacd5de 1f17043
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 12:47:27 2013 -0700

    am 1f170438: (-s ours) am 17d6b4c1: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '1f1704387e7f4b4997797ee575dc4a44b7ae7853':

commit 1f1704387e7f4b4997797ee575dc4a44b7ae7853
Merge: dacd5de 17d6b4c
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 12:28:12 2013 -0700

    am 17d6b4c1: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '17d6b4c1f7ce789475478375416959ff35fd09cb':

commit 17d6b4c1f7ce789475478375416959ff35fd09cb
Merge: d2f6ad6 29f419a
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 12:22:33 2013 -0700

    Reconcile with jb-mr1-release - do not merge

commit 70c9e28e8a37114b28638e1670d1f81586afd556
Merge: 6fabfd0 f335592
Author: Jay Shrauner <shrauner@google.com>
Date:   Thu Mar 7 21:36:34 2013 +0000

    Merge "Use ICU ImmutableIndex" into jb-mr2-dev

commit 6fabfd02577c9c631cd371131c3e161122329777
Author: Jay Shrauner <shrauner@google.com>
Date:   Thu Mar 7 12:35:01 2013 -0800

    Fix FastScrollingIndexCache test

    Make sure the FastScrollingIndexCache instance used for the unit tests
    was created with the correct MockSharedPreferences

    Bug:
    Change-Id: I612638dadab394ea3ed8abbbe6f47de5f17601fe

commit f335592cc008403f2b6e708b65017903ab83034b
Author: Jay Shrauner <shrauner@google.com>
Date:   Thu Mar 7 11:57:23 2013 -0800

    Use ICU ImmutableIndex

    Switch to using ICU ImmutableIndex, which is thread-safe and theoretically
    has faster lookups.

    Bug:
    Change-Id: Icd1f8b53c73f44fe71aeb99aefb9286405ea32d1

commit 9f675502e2ab04e37b043d29d82b1d19458cd1b2
Merge: 659016d 2d2e226
Author: Jay Shrauner <shrauner@google.com>
Date:   Tue Mar 5 22:13:31 2013 +0000

    Merge "Auto-update ContactsDB on ICU version change" into jb-mr2-dev

commit 2d2e22626b698b2484026ae18eca3c2c6340f2d1
Author: Jay Shrauner <shrauner@google.com>
Date:   Wed Feb 27 14:53:41 2013 -0800

    Auto-update ContactsDB on ICU version change

    Save current ICU version into the ContactsDB and rebuild
    locale specific data whenever the version changes.

    Bug:
    Change-Id: Id5fd3e178558dc903b522b2655c75e6aa353f6e5

commit 659016dd6a7ac6659d978c45d91400e4627afe6b
Merge: 21cfa60 c6e2812
Author: Chiao Cheng <chiaocheng@google.com>
Date:   Mon Mar 4 18:12:57 2013 +0000

    Merge "Reverting is_primary sort order back to previous priority." into jb-mr2-dev

commit c6e28121e4c522c31c96e0ea97b66012cc571160
Author: Chiao Cheng <chiaocheng@google.com>
Date:   Thu Feb 28 16:55:44 2013 -0800

    Reverting is_primary sort order back to previous priority.

    Bug: 8129961
    Change-Id: If6dd3b5ebec19ef7c9fea493d90f0e8d88435f01

commit 21cfa6019b9fb82c23edf978d27904757207d9b0
Author: Jay Shrauner <shrauner@google.com>
Date:   Wed Feb 27 11:26:01 2013 -0800

    Fix unit tests for ICU 50

    Fix tests to account for fixes made in ICU 50. Add some additional tests.

    Bug:
    Change-Id: I7d1fb0588f56b58da5c5177823ed5c16c4603e24

commit 923bd87366167e0a569883993e9ec5b19104657a
Merge: a6a9fa8 6800627
Author: Dianne Hackborn <hackbod@google.com>
Date:   Wed Feb 27 01:22:58 2013 +0000

    Merge "Call new init function to use for testing, to turn off app ops." into jb-mr2-dev

commit 6800627f331da6be1ea7cc82202eb6d94588c44f
Author: Dianne Hackborn <hackbod@google.com>
Date:   Tue Feb 26 15:03:23 2013 -0800

    Call new init function to use for testing, to turn off app ops.

    Change-Id: I81c749401c54c9f3facc921b7bc4e778a33ea22e

commit a6a9fa802d1b56c206c670ca1d313bc64effcb5d
Author: Jay Shrauner <shrauner@google.com>
Date:   Wed Feb 13 15:45:02 2013 -0800

    Use ICU JNI wrappers for phonebook labels

    Switch from using native code registered as sqlite callbacks to using
    JNI wrappers for accessing ICU AlphabeticIndex. Stop using specialized
    sort keys for Simplified Chinese because ICU code can correctly label
    the characters directly.

    Bug:
    Change-Id: I0568b3a406495c147c7b9b3e72835d11d93f9d16

commit 79b591543a37f256fcc93dc8b47017afc9c8dbca
Author: Jay Shrauner <shrauner@google.com>
Date:   Mon Feb 18 13:04:20 2013 -0800

    Call ICU lib for Pinyin transliteration

    Switch from using hard coded tables copied from ICU to calling ICU
    Transliterator directly for Pinyin transliteration.

    Bug:
    Change-Id: I87aae623dfe049a90cee213182275aa51a7dcd9c

commit 49fb8375e9d3f7385d41b352d164a4e3e98c1528
Author: Dianne Hackborn <hackbod@google.com>
Date:   Fri Feb 8 11:31:34 2013 -0800

    Fix issue #8152662: Unable to share a contact via Email

    When contacts provider internally recurses into itself, we need
    to clear the binder calling identity before doing so, so that it
    is consistent with the calling package name we will now be using.

    Note that this also means that we won't be doing any further
    permission checks against the original caller for these internal
    provider calls...  which is probably more correct anyway, because
    we've already done the permission check on the original incoming
    URI and we wouldn't want that to now fail due to some permission
    strangeness on another URI it is using internally.

    Change-Id: Icc3903287f91f35959a80168a6c107b1803f93a8

commit 3c05145763ad30eda83134411968942e1c11d06f
Merge: 9d8eb3d 255e7f1
Author: Jay Shrauner <shrauner@google.com>
Date:   Wed Feb 6 21:17:56 2013 +0000

    Merge "Fix collation/indexing for i18n contacts"

commit 9d8eb3d7565b08f9b3228920b77378c38081bdc0
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Feb 4 10:51:30 2013 -0800

    Import translations. DO NOT MERGE

    Change-Id: Ic347ccd02c4a6a9956824df0ee18a869e69ddce9
    Auto-generated-cl: translation import

commit c9626e7befd591923c6af859ad079abba8a84e41
Author: Dianne Hackborn <hackbod@google.com>
Date:   Tue Jan 15 12:29:09 2013 -0800

    Start tracking content provider app ops.

    Change-Id: I899c3ae507a0e4feb95c8142b09b92e1fd87eefe

commit 4d9895e902260670a96d0c3a9e792b3a6452577d
Merge: 7f51fad 068e3ed
Author: Yorke Lee <yorkelee@google.com>
Date:   Tue Jan 15 18:13:31 2013 -0800

    Merge "Include name prefix in search index"

commit 068e3ed308560cb92b985837b05a404da2060cbe
Author: Yorke Lee <yorkelee@google.com>
Date:   Tue Jan 15 14:54:16 2013 -0800

    Include name prefix in search index

    Bug: 6987476
    Change-Id: I99816c32938b5b3db5f79d816d91d814ab9dca6c

commit 7f51fad03f571e9f41ea7766b0f6231895c53d97
Author: Yorke Lee <yorkelee@google.com>
Date:   Thu Jan 10 15:58:24 2013 -0800

    Use phonetic name as display name if no other given name

    Bug: 7942098
    Change-Id: I0c43b6e78471631f6400d836311ec84658f063c9

commit fda4395adc9266d0f8e0be8637d0effa7fd1e057
Author: Yorke Lee <yorkelee@google.com>
Date:   Tue Jan 8 15:40:06 2013 -0800

    Standardize search algorithm between People and Dialer

    Bug: 5930716
    Change-Id: Ic7cfffae5de878be683d27f92ccb5b034dc217c3

commit 255e7f1b8eebd0df68030289a22e9c3c4d6efa3d
Author: Jay Shrauner <shrauner@google.com>
Date:   Thu Jan 3 11:03:36 2013 -0800

    Fix collation/indexing for i18n contacts

    Fix issue of contacts appearing under wrong label--sort contacts by
    sort key, not by label.

    Fix handling of labels that require more than the first character
    (eg Czech 'CH') by using entire sortkey--not just the first letter--
    to determine label.

    Bug:7351596
    Change-Id: Iaabc63041540f621220d0463df3e0850684caa94

commit c231bb10ca1ae310568a0c7cb4f327e348ecde3b
Author: Chiao Cheng <chiaocheng@google.com>
Date:   Fri Dec 21 15:54:22 2012 -0800

    Fixing missing punctuation for punctuation search case.

    Previous CL I9cbdf10d21c79f53bc621bacb7eeeb95a6a2435f fixed missing
    punctuation at the start when searching without punctuation. (e.g.
    {hello})

    This CL fixes the case where leading punctuation is missing if you searched
    with a leading punctuation. (e.g. {'hello}).  The content provider
    uses a different code path when it detects multi-words and snippeting
    is actually done in sqlite using the FTS snippet method. The check for
    multi-word was treating {'hello} as two words.

    This means that multi-word searches will still have this issue as it still
    uses the sqlite snippet method.  Leaving this to a separate CL since it's
    a riskier change.

    Bug: 5929143
    Change-Id: I4c2451b2e8eb47d5831e6ef6cfcca538ff3599b9

commit 4027677052d53822af586c13937f8f0cd27f50d6
Author: Yorke Lee <yorkelee@google.com>
Date:   Thu Dec 13 12:06:09 2012 -0800

    Provide helpful log message on attempt to downgrade SQL version

    Bug: 7709971
    Change-Id: I1a7eff95ff76e21b3b29535f09c95591469b707f

commit e7fd96a61006c1be2e0713282a5a10531efc2ae5
Merge: 5d04f42 75a0a0b
Author: Chiao Cheng <chiaocheng@google.com>
Date:   Mon Nov 26 13:26:16 2012 -0800

    am 75a0a0b0: am dacd5de1: Change default sort order for email queries.

    * commit '75a0a0b0ece29241b4712126af53841d5dcdb442':
      Change default sort order for email queries.

commit 75a0a0b0ece29241b4712126af53841d5dcdb442
Merge: b036f67 dacd5de
Author: Chiao Cheng <chiaocheng@google.com>
Date:   Mon Nov 26 13:24:26 2012 -0800

    am dacd5de1: Change default sort order for email queries.

    * commit 'dacd5de146b413de86d38b6f56a3fe0b2af4b155':
      Change default sort order for email queries.

commit 5d04f429708c3a7478a2b3b8a16298182237e78a
Merge: 76c8729 b036f67
Author: Makoto Onuki <omakoto@google.com>
Date:   Fri Nov 16 10:43:00 2012 -0800

    am b036f674: am f5c0020b: Rebuild SQLITE_STAT1 table after drop operations.

    * commit 'b036f6745c97e7bd654ee1b44122ceece917dd47':
      Rebuild SQLITE_STAT1 table after drop operations.

commit b036f6745c97e7bd654ee1b44122ceece917dd47
Merge: 1e6561d f5c0020
Author: Makoto Onuki <omakoto@google.com>
Date:   Thu Nov 15 17:02:31 2012 -0800

    am f5c0020b: Rebuild SQLITE_STAT1 table after drop operations.

    * commit 'f5c0020b87709f9c4c3de66a49c0893e2c2adebb':
      Rebuild SQLITE_STAT1 table after drop operations.

commit 76c8729e2e81c889a730e62deb1e3aac67d5ca50
Merge: 5becf6c 7d098d9
Author: Chiao Cheng <chiaocheng@google.com>
Date:   Wed Nov 14 18:05:59 2012 -0800

    Merge "Use Objects from guava library."

commit 7d098d938e3414da40557ad6217d872282056b43
Author: Chiao Cheng <chiaocheng@google.com>
Date:   Wed Nov 14 15:54:15 2012 -0800

    Use Objects from guava library.

    Switch com.android.internal.util.Objects to com.google.common.base.Objects.

    Technically this change is not necessary for the provider but it nice to
    use the same code everywhere.  And since the provider already has a
    dependency on guava anyways, this doesn't hurt.

    Bug: 6948882
    Change-Id: I565d65f00b1f25c4ae1bf3c8086c10ab2f31dfd5

commit 5becf6ccf888400e72a9404e5e50a17ba75bac2b
Merge: 874e0ed 1e6561d
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:34:11 2012 -0800

    am 1e6561dd: (-s ours) am 17f1fe1a: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit '1e6561ddfc941d51592a4285c8fe2d054ed29f02':

commit 1e6561ddfc941d51592a4285c8fe2d054ed29f02
Merge: 94fc236 17f1fe1
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:30:11 2012 -0800

    am 17f1fe1a: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit '17f1fe1a960db78c84aaa753c784a4df513a1d3d':

commit 874e0edc8875776588dd42dca29cdb0a10b76eb0
Merge: be431bb 94fc236
Author: Makoto Onuki <omakoto@google.com>
Date:   Tue Oct 2 12:10:48 2012 -0700

    am 94fc236d: am 0e014723: am 2a9d1fab: Merge "Make CONTACTS_AS_MULTI_VCARD locale safe"

    * commit '94fc236d199460bddc390ce7f384b446c14df622':
      Make CONTACTS_AS_MULTI_VCARD locale safe

commit 94fc236d199460bddc390ce7f384b446c14df622
Merge: ffed1ed 0e01472
Author: Makoto Onuki <omakoto@google.com>
Date:   Tue Oct 2 12:07:46 2012 -0700

    am 0e014723: am 2a9d1fab: Merge "Make CONTACTS_AS_MULTI_VCARD locale safe"

    * commit '0e014723e6d5d2acc3d59b78cee9a6d1fbfef1e9':
      Make CONTACTS_AS_MULTI_VCARD locale safe

commit 0e014723e6d5d2acc3d59b78cee9a6d1fbfef1e9
Merge: 3b1b1d5 2a9d1fa
Author: Makoto Onuki <omakoto@google.com>
Date:   Tue Oct 2 12:05:09 2012 -0700

    am 2a9d1fab: Merge "Make CONTACTS_AS_MULTI_VCARD locale safe"

    * commit '2a9d1fab1669d2962aa830872f063c1180fbea94':
      Make CONTACTS_AS_MULTI_VCARD locale safe

commit 2a9d1fab1669d2962aa830872f063c1180fbea94
Merge: 7d112d5 0788053
Author: Makoto Onuki <omakoto@google.com>
Date:   Tue Oct 2 11:28:51 2012 -0700

    Merge "Make CONTACTS_AS_MULTI_VCARD locale safe"

commit be431bb0e55260ad0ea7a09269669ca45d9db906
Merge: bbdc6f0 ffed1ed
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 2 09:24:49 2012 -0700

    am ffed1ede: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'ffed1ede87553f8d6a104a5e92945fd5fa4557f9':

commit ffed1ede87553f8d6a104a5e92945fd5fa4557f9
Merge: 0a78ee3 29f419a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 2 09:20:38 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ib983813de597b2eabfc0e4657a5945c8791a5c88

commit bbdc6f0ca72a83c2a2ddd7bdc155c5b4a00cb7e8
Merge: 7033454 bdf112f
Author: Piotr Jastrzebski <haaawk@google.com>
Date:   Tue Oct 2 03:52:46 2012 -0700

    Merge "Cancellation of queries for search suggestions."

commit 0788053f47eb6bc66b99a8747351ece2db7c3871
Author: Johan Redestig <johan.redestig@sonymobile.com>
Date:   Tue Oct 2 09:28:12 2012 +0200

    Make CONTACTS_AS_MULTI_VCARD locale safe

    SimpleDateFormat was used with the default locale to build
    SQL statements; this is unsafe for some locales. Switched
    to Locale.US.

    Change-Id: I7307b12e1f3d796e1bb4a73d97918d0162ca971e

commit 70334543fc09917d85899d7cf3399bd8f1542d41
Merge: 4a904bd 0a78ee3
Author: Makoto Onuki <omakoto@google.com>
Date:   Mon Oct 1 17:33:54 2012 -0700

    am 0a78ee3a: am d2f6ad6d: Make sure to rebuild search index on locale changes...

    * commit '0a78ee3aeeb33711d44993be61e3d48f78e2d640':
      Make sure to rebuild search index on locale changes...

commit 0a78ee3aeeb33711d44993be61e3d48f78e2d640
Merge: 54658c3 d2f6ad6
Author: Makoto Onuki <omakoto@google.com>
Date:   Mon Oct 1 17:31:53 2012 -0700

    am d2f6ad6d: Make sure to rebuild search index on locale changes...

    * commit 'd2f6ad6d50b5570327f8cca3b2d2bdcaec36ea90':
      Make sure to rebuild search index on locale changes...

commit bdf112f12eafe116bbf931a0c4158a6fb5713b3f
Author: Piotr Jastrzebski <haaawk@google.com>
Date:   Fri Sep 28 12:11:38 2012 +0100

    Cancellation of queries for search suggestions.

    Passing CancellableSignal from ContactsProvider2.queryLocal to
    GlobalSearchSupport.handleSearchSuggestionsQuery,
    GlobalSearchSupport.addSearchSuggestionsBasedOnFilter and
    SQLiteDatabase.rawQuery.

    Search App needs this change to cancel queries for search suggestions which are
    no longer valid due to some user action.

    Change-Id: Ie019afff31bf49ba96a88899e829813075ab141e

commit 4a904bddf16e7500a00f1f54eaa32fc452ca3827
Merge: 607ed61 54658c3
Author: Makoto Onuki <omakoto@google.com>
Date:   Fri Sep 28 00:35:52 2012 -0700

    am 54658c3e: am 9ff25876: Make sure to invalidate fast index cache when

    * commit '54658c3ede6c33fe5e62f9895fa509776973002e':
      Make sure to invalidate fast index cache when

commit 607ed610b3faac9c5c3521cdac7d9db4ec99b756
Merge: 5891b13 863474b
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Sep 28 00:32:59 2012 -0700

    am 863474b4: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '863474b4a1a118d1d9181cf46f3466ccd0efa6b2':

commit 54658c3ede6c33fe5e62f9895fa509776973002e
Merge: 863474b 9ff2587
Author: Makoto Onuki <omakoto@google.com>
Date:   Thu Sep 27 17:16:17 2012 -0700

    am 9ff25876: Make sure to invalidate fast index cache when

    * commit '9ff2587608416b4378767141ad396f51f23040a7':
      Make sure to invalidate fast index cache when

commit 863474b4a1a118d1d9181cf46f3466ccd0efa6b2
Merge: a78c7b6 468e39e
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 27 09:59:46 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ibdb66a3b7b73717c90a2b08f6c2d2cf6c237b8ce

commit 5891b13e677c67b85d01eb26bf8db460bae3760f
Merge: 3959dc5 a78c7b6
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Wed Sep 26 20:23:03 2012 -0700

    am a78c7b6f: am 7b4a5d52: Remove Secure setting usage.

    * commit 'a78c7b6f1168f12d46dc0f880124c3cf3b7d80eb':
      Remove Secure setting usage.

commit a78c7b6f1168f12d46dc0f880124c3cf3b7d80eb
Merge: 3ccddf9 7b4a5d5
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Wed Sep 26 20:18:59 2012 -0700

    am 7b4a5d52: Remove Secure setting usage.

    * commit '7b4a5d522df5282cd7dac655b4c673c06d1f449b':
      Remove Secure setting usage.

commit 3959dc590c6dd62e8fba5352fc00bf9bdc6922f9
Merge: 94df22a 3ccddf9
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 20 12:52:40 2012 -0700

    am 3ccddf93: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '3ccddf93ac6b55b6918f23b5b143c7b1ad0e5332':

commit 3ccddf93ac6b55b6918f23b5b143c7b1ad0e5332
Merge: 4a243a5 59eb0c6
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 20 10:37:14 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ib5ce9a829c2afde6f7d727c056c24386c6d639fd

commit 94df22ad34295c1e1198ecc53466e44471f8d4d0
Merge: 4a3b556 4a243a5
Author: Makoto Onuki <omakoto@google.com>
Date:   Thu Sep 13 14:04:41 2012 -0700

    am 4a243a58: am 2b7c28ce: Merge "Send a broadcast when profile changes" into jb-mr1-dev

    * commit '4a243a589841db65b8b9d5b5398f7eab506a825a':
      Send a broadcast when profile changes

commit 4a3b556c737cc419e0f1e358fc0f09439b434286
Merge: 3661fc6 634d21a
Author: Yorke Lee <yorkelee@google.com>
Date:   Thu Sep 13 14:04:26 2012 -0700

    am 634d21a3: am a6f9ec00: Skip suffix match if mUseStrictPhoneNumberComparison is true

    * commit '634d21a343cd2b2e7d1cd5e668f4b45da7c59344':
      Skip suffix match if mUseStrictPhoneNumberComparison is true

commit 4a243a589841db65b8b9d5b5398f7eab506a825a
Merge: 634d21a 2b7c28c
Author: Makoto Onuki <omakoto@google.com>
Date:   Wed Sep 12 18:10:16 2012 -0700

    am 2b7c28ce: Merge "Send a broadcast when profile changes" into jb-mr1-dev

    * commit '2b7c28ce69dd596f986df0932aeb3bd00c52deb2':
      Send a broadcast when profile changes

commit 634d21a343cd2b2e7d1cd5e668f4b45da7c59344
Merge: 0394f45 a6f9ec0
Author: Yorke Lee <yorkelee@google.com>
Date:   Wed Sep 12 17:47:36 2012 -0700

    am a6f9ec00: Skip suffix match if mUseStrictPhoneNumberComparison is true

    * commit 'a6f9ec007fb108f9f82e73bfdaef7ffc5e67cffc':
      Skip suffix match if mUseStrictPhoneNumberComparison is true

commit 3661fc689c4718fd3da33c9d1a100d37fb82277c
Merge: cde6056 0394f45
Author: Yorke Lee <yorkelee@google.com>
Date:   Wed Sep 12 17:03:23 2012 -0700

    am 0394f454: am 6db6c6d7: Change fallback method  for contact matching

    * commit '0394f454b6ac76cbecb49f560700164dd3d0148f':
      Change fallback method  for contact matching

commit 0394f454b6ac76cbecb49f560700164dd3d0148f
Merge: a829341 6db6c6d
Author: Yorke Lee <yorkelee@google.com>
Date:   Wed Sep 12 14:06:21 2012 -0700

    am 6db6c6d7: Change fallback method  for contact matching

    * commit '6db6c6d74da066cbbe3e3b5b89caf1ba5626d240':
      Change fallback method  for contact matching

commit cde60564c954dfd26b33223967a49385ef8d92ed
Merge: b5eeda9 a829341
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 6 08:23:51 2012 -0700

    am a8293416: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'a8293416f518a38b94ae6b39efc7490d34f09e85':

commit a8293416f518a38b94ae6b39efc7490d34f09e85
Merge: 28cf87f 7a8fd23
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 6 07:55:03 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ib413b5627f3ab9e6fa6d8fc1775da5f12a704b14

commit b5eeda968988a84935d07509f677b5693b112741
Merge: d347f5d 28cf87f
Author: Makoto Onuki <omakoto@google.com>
Date:   Mon Aug 27 12:10:49 2012 -0700

    am 28cf87f7: am 4b4404b1: Remove unneeded uses-permissions.

    * commit '28cf87f74cab38e2c381df1a5fea39fe22af557a':
      Remove unneeded uses-permissions.

commit 28cf87f74cab38e2c381df1a5fea39fe22af557a
Merge: 8397fc6 4b4404b
Author: Makoto Onuki <omakoto@google.com>
Date:   Mon Aug 27 12:08:50 2012 -0700

    am 4b4404b1: Remove unneeded uses-permissions.

    * commit '4b4404b1d54dfb8fa8a1f695eefaa33b37f602e4':
      Remove unneeded uses-permissions.

commit d347f5da30bb944d7db95459605c38fc042e009c
Merge: b0c3363 8397fc6
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Sat Aug 25 07:21:34 2012 -0700

    am 8397fc6a: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '8397fc6aaaaeda7a4e0d62b9419cab05ab0b9fd5':

commit 8397fc6aaaaeda7a4e0d62b9419cab05ab0b9fd5
Merge: 0325274 316d89e
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Sat Aug 25 07:17:45 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ie51406251152692347f738883ae33a9ba62435fb

commit b0c3363528d7db079830d5e95c43f97cb9013307
Merge: 34c3a49 0325274
Author: Makoto Onuki <omakoto@google.com>
Date:   Fri Aug 24 14:19:25 2012 -0700

    am 03252745: am e31a15bc: am 3b1b1d5e: am 7d112d54: Merge "Update HanziToPinyin table and tests."

    * commit '03252745bc989850168264226ad54bfd59e49f55':
      Update HanziToPinyin table and tests.

commit 03252745bc989850168264226ad54bfd59e49f55
Merge: 2427a85 e31a15b
Author: Makoto Onuki <omakoto@google.com>
Date:   Fri Aug 24 14:14:41 2012 -0700

    am e31a15bc: am 3b1b1d5e: am 7d112d54: Merge "Update HanziToPinyin table and tests."

    * commit 'e31a15bcfe67f21320a71758411ba756f1d60f23':
      Update HanziToPinyin table and tests.

commit 34c3a499c949035f9af52fb4bfdd14112bf36507
Merge: f125543 2427a85
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Aug 23 19:39:04 2012 -0700

    am 2427a855: (-s ours) am 98e25a0b: Import translations. DO NOT MERGE

    * commit '2427a85564cd5d00a9c74a8f91e791da9c81b137':
      Import translations. DO NOT MERGE

commit 2427a85564cd5d00a9c74a8f91e791da9c81b137
Merge: 5810896 98e25a0
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Aug 23 19:37:36 2012 -0700

    am 98e25a0b: Import translations. DO NOT MERGE

    * commit '98e25a0b5e5ca41f051265b0316f4b48c1565d37':
      Import translations. DO NOT MERGE

commit f1255430ad3c3a379e4b313ae83ede6d1d1bd5a8
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Aug 23 17:05:42 2012 -0700

    Import translations. DO NOT MERGE

    Change-Id: I32e8f3821d255d68255360c84fd3d6dfcbb9a43b
    Auto-generated-cl: translation import

commit dcb1d282bbdf5d63070d89bd74662e7f805f6fce
Merge: 597a185 5810896
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Aug 22 20:32:56 2012 -0700

    am 58108961: (-s ours) am cbbc0619: Import translations. DO NOT MERGE

    * commit '581089619ae9971213d8c96b693a8444963e6459':
      Import translations. DO NOT MERGE

commit 581089619ae9971213d8c96b693a8444963e6459
Merge: 53e73b1 cbbc061
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Aug 22 20:31:18 2012 -0700

    am cbbc0619: Import translations. DO NOT MERGE

    * commit 'cbbc06190c8538fa46964ddc205da6971afdd22a':
      Import translations. DO NOT MERGE

commit 597a185b48a08e570c3298f6cc313ac4cc28138c
Merge: d0d1694 abd3a29
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Aug 22 20:29:23 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit d0d16945c6e8530b3ec22176f1147954a710ebb2
Merge: ef5b185 53e73b1
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 22 15:40:03 2012 -0700

    am 53e73b1f: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '53e73b1f6d70d022cede0994fd8d4aab59b37d93':

commit 53e73b1f6d70d022cede0994fd8d4aab59b37d93
Merge: 2e6d182 4494c10
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 22 15:36:39 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I878ca38cad6efc67ad6b612e5cd8bc93de7e9d8f

commit abd3a2988efc8d8d2d2a5ac2ff8ba2cec2301bc7
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Aug 22 10:36:55 2012 -0700

    Import translations. DO NOT MERGE

    Change-Id: Iee4364d4e7f38794417e8c643688b23cdeb3fc97
    Auto-generated-cl: translation import

commit ef5b1852fcfd52f44e9932bd756740e180a31076
Merge: 87c54a5 2e6d182
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Aug 21 16:10:00 2012 -0700

    am 2e6d182e: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '2e6d182e09073fe4ddf1ee38fb831a4e50c9e588':

commit 2e6d182e09073fe4ddf1ee38fb831a4e50c9e588
Merge: 0c6bd0a 6c4b515
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Aug 21 16:07:26 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I7663718d128bb09e7366d9d375f823fb684c7d59

commit 87c54a51cba784a7d9c39f836e0da150df8302d8
Merge: e165f52 0c6bd0a
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 21 12:29:28 2012 -0700

    am 0c6bd0af: (-s ours) am 708d6cd0: Import translations. DO NOT MERGE

    * commit '0c6bd0afc37e1aad37ff9748740eaa87c8fb23fc':
      Import translations. DO NOT MERGE

commit 0c6bd0afc37e1aad37ff9748740eaa87c8fb23fc
Merge: 7a485eb 708d6cd
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 21 12:27:50 2012 -0700

    am 708d6cd0: Import translations. DO NOT MERGE

    * commit '708d6cd081d8147626a74bd9882824378ce54e93':
      Import translations. DO NOT MERGE

commit e165f5235523a3f65dbf950a791ffe5f1ddfe5ce
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 21 09:58:07 2012 -0700

    Import translations. DO NOT MERGE

    Change-Id: I8d0f2a4ff4d94910440800f392c3541a66ed8267
    Auto-generated-cl: translation import

commit 0368b524848d02f2c6557bb84538603df48c3f34
Merge: 671de1c 7a485eb
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Aug 20 15:51:54 2012 -0700

    am 7a485ebb: (-s ours) am a97744ee: Import translations. DO NOT MERGE

    * commit '7a485ebba9256f9687cc6aa545059dbd35111801':
      Import translations. DO NOT MERGE

commit 7a485ebba9256f9687cc6aa545059dbd35111801
Merge: 3427a9f a97744e
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Aug 20 15:50:27 2012 -0700

    am a97744ee: Import translations. DO NOT MERGE

    * commit 'a97744eece2b24cec5784fc625d74c0b6fd5a5df':
      Import translations. DO NOT MERGE

commit 671de1c3b3f6c4776143b363a5dd651bbd94d114
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Aug 20 08:42:50 2012 -0700

    Import translations. DO NOT MERGE

    Change-Id: I7f56733f47b6c917d2b3e7770fb94efdb5d46bf0
    Auto-generated-cl: translation import

commit fbccc27d0f862e85550979907c0e68067d9add43
Merge: cc05d95 3427a9f
Author: Makoto Onuki <omakoto@google.com>
Date:   Fri Aug 17 16:16:53 2012 -0700

    am 3427a9fa: am 948cd57f: Merge "Inprove database dump" into jb-mr1-dev

    * commit '3427a9fa537658d050a8f9246f2c8affcf5b40d2':
      Inprove database dump

commit 3427a9fa537658d050a8f9246f2c8affcf5b40d2
Merge: f72799e 948cd57
Author: Makoto Onuki <omakoto@google.com>
Date:   Fri Aug 17 16:14:42 2012 -0700

    am 948cd57f: Merge "Inprove database dump" into jb-mr1-dev

    * commit '948cd57f3a2a0fdee9698547f9c22673f704412b':
      Inprove database dump

commit cc05d95fc3c367104233a600116b6f665e4d097b
Merge: 225f1ea f72799e
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Aug 17 11:04:06 2012 -0700

    am f72799ea: (-s ours) am 4fbb350f: Import translations. DO NOT MERGE

    * commit 'f72799ea696fba0c8c3faa612508aa2dde70f7e6':
      Import translations. DO NOT MERGE

commit f72799ea696fba0c8c3faa612508aa2dde70f7e6
Merge: eb9f654 4fbb350
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Aug 17 10:24:29 2012 -0700

    am 4fbb350f: Import translations. DO NOT MERGE

    * commit '4fbb350f7fff5c1e7bf8882241a77d9eab3680e8':
      Import translations. DO NOT MERGE

commit 225f1eacb4fb6fb030661e01c402869635c5b821
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Aug 17 10:18:47 2012 -0700

    Import translations. DO NOT MERGE

    Change-Id: I787372934b0ccf83ad334dac13a54d2147057103
    Auto-generated-cl: translation import

commit ecfbe05797c819be8d5f3c9dc88e4140a69d5583
Merge: 12ab9f8 eb9f654
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Aug 16 19:13:16 2012 -0700

    am eb9f6545: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'eb9f65453fff5c6170f9a1e877abdf9f6de15f78':

commit eb9f65453fff5c6170f9a1e877abdf9f6de15f78
Merge: 0dd3ecc feb6bd1
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Aug 16 19:11:30 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I3204ba274a24f88cf9886569f898880e9c758290

commit 12ab9f830c476257742efbfb254dbb07f3b6158f
Merge: 71a2c5e 0dd3ecc
Author: Subir Jhanb <subir@google.com>
Date:   Thu Aug 16 17:33:51 2012 -0700

    am 0dd3ecc9: am a6bef4a5: Add a new permission needed for Gal lookups to the contacts provider BUG: 6897999

    * commit '0dd3ecc99b4b1fcfb84a53e7b0faf7a4040ed4f4':
      Add a new permission needed for Gal lookups to the contacts provider BUG: 6897999

commit 0dd3ecc99b4b1fcfb84a53e7b0faf7a4040ed4f4
Merge: 8a0dc9c a6bef4a
Author: Subir Jhanb <subir@google.com>
Date:   Thu Aug 16 17:31:46 2012 -0700

    am a6bef4a5: Add a new permission needed for Gal lookups to the contacts provider BUG: 6897999

    * commit 'a6bef4a58a4e61649c8e9ee337fa1e0ac59333e6':
      Add a new permission needed for Gal lookups to the contacts provider BUG: 6897999

commit 71a2c5ed70063590009eb52d06018be3371fb576
Merge: 11b2ac5 8a0dc9c
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Aug 16 12:59:01 2012 -0700

    am 8a0dc9cc: (-s ours) am 4fadf9d6: Import translations. DO NOT MERGE

    * commit '8a0dc9cca3107308aef1d75b6d122f874b024725':
      Import translations. DO NOT MERGE

commit 8a0dc9cca3107308aef1d75b6d122f874b024725
Merge: bf60728 4fadf9d
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Aug 16 12:56:53 2012 -0700

    am 4fadf9d6: Import translations. DO NOT MERGE

    * commit '4fadf9d63eec24a08467a5cc29d94d03ce3814db':
      Import translations. DO NOT MERGE

commit 11b2ac582772b54d8d696513d4be957d3444d476
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Aug 16 12:52:49 2012 -0700

    Import translations. DO NOT MERGE

    Change-Id: I12de2914e695d27a67e07ef3338094259b1792d6
    Auto-generated-cl: translation import

commit 9dcddffe7321fbf254b6a770e933aabbee7e355b
Merge: 0592931 bf60728
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Aug 15 15:43:32 2012 -0700

    am bf60728e: (-s ours) am f109f24e: Import translations. DO NOT MERGE

    * commit 'bf60728e80d52ab21d8351712eacc67327c3daf3':
      Import translations. DO NOT MERGE

commit bf60728e80d52ab21d8351712eacc67327c3daf3
Merge: 2d85ca3 f109f24
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Aug 15 15:41:37 2012 -0700

    am f109f24e: Import translations. DO NOT MERGE

    * commit 'f109f24e62808282e353048974cc782c7de2adea':
      Import translations. DO NOT MERGE

commit 0592931edb7b4ed767c3f9bdeaf6eb4a76337961
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Aug 15 14:24:44 2012 -0700

    Import translations. DO NOT MERGE

    Change-Id: Ide4d1b27f08b595eb6e94599965b9d0bd8ad9cab
    Auto-generated-cl: translation import

commit 27d23cd99fcabf111002af3b07752753325bbc64
Merge: 8830283 2d85ca3
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 15 08:32:33 2012 -0700

    am 2d85ca3c: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '2d85ca3c91d43a7192363b24cf99eac60c7a7904':

commit 2d85ca3c91d43a7192363b24cf99eac60c7a7904
Merge: bb149f7 dd902a4
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 15 08:28:57 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I1ebb7a397dd05549889ee351fbaa2fde1712cfb8

commit 8830283f3c8289800368b840324d608fbad9981f
Merge: e2dbb45 bb149f7
Author: Makoto Onuki <omakoto@google.com>
Date:   Tue Aug 14 14:36:54 2012 -0700

    am bb149f70: am c458f77c: Merge "Make "export contacts database" more secure" into jb-mr1-dev

    * commit 'bb149f70be2e0478cef3692feda1ade2ba240282':
      Make "export contacts database" more secure

commit bb149f70be2e0478cef3692feda1ade2ba240282
Merge: f074842 c458f77
Author: Makoto Onuki <omakoto@google.com>
Date:   Tue Aug 14 14:34:52 2012 -0700

    am c458f77c: Merge "Make "export contacts database" more secure" into jb-mr1-dev

    * commit 'c458f77ccd89757cf82b2e839715f467d87f901e':
      Make "export contacts database" more secure

commit e2dbb45601ceb04fdb0c15507e8019ecd233d377
Merge: 896a93b f074842
Author: Chiao Cheng <chiaocheng@google.com>
Date:   Tue Aug 14 11:00:54 2012 -0700

    am f074842f: am e530c055: Merge "Adding limit and offset parameters to calllog provider." into jb-mr1-dev

    * commit 'f074842fc90889be3bda8c4288d9a9f110534c09':
      Adding limit and offset parameters to calllog provider.

commit f074842fc90889be3bda8c4288d9a9f110534c09
Merge: 718d707 e530c05
Author: Chiao Cheng <chiaocheng@google.com>
Date:   Tue Aug 14 10:59:42 2012 -0700

    am e530c055: Merge "Adding limit and offset parameters to calllog provider." into jb-mr1-dev

    * commit 'e530c0557f69d4758273ef22d7c4bbf48e1f3da7':
      Adding limit and offset parameters to calllog provider.

commit 896a93b975ec635a5716a625fe7a3db5c2f10b17
Merge: 3dc3d94 718d707
Author: Makoto Onuki <omakoto@google.com>
Date:   Fri Aug 10 14:48:36 2012 -0700

    am 718d707f: am e8956364: Merge "Don\'t leave stale normalized number when updating..." into jb-mr1-dev

    * commit '718d707fb717b36bbacbce94d4e14f3942a94c01':
      Don't leave stale normalized number when updating...

commit 718d707fb717b36bbacbce94d4e14f3942a94c01
Merge: e5a09b0 e895636
Author: Makoto Onuki <omakoto@google.com>
Date:   Fri Aug 10 14:46:13 2012 -0700

    am e8956364: Merge "Don\'t leave stale normalized number when updating..." into jb-mr1-dev

    * commit 'e8956364a9cf4ec0f463768a6116fdcda8635b13':
      Don't leave stale normalized number when updating...

commit 3dc3d948d1e10b46e2b6d53402f2385ce4763996
Merge: a9e2014 e5a09b0
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Aug 10 14:46:07 2012 -0700

    am e5a09b0f: am 9bc20fb9: resolved conflicts for merge of 3646b108 to jb-mr1-dev

    * commit 'e5a09b0f6e740feff34dcf0ec347c7721e9701c3':
      Sync HanziToPinyin tables with ICU 4.6.

commit e5a09b0f6e740feff34dcf0ec347c7721e9701c3
Merge: 4924a1b 9bc20fb
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Aug 10 14:44:44 2012 -0700

    am 9bc20fb9: resolved conflicts for merge of 3646b108 to jb-mr1-dev

    * commit '9bc20fb9de84effe8e88ccf9d526beafcea92ee9':
      Sync HanziToPinyin tables with ICU 4.6.

commit a9e2014ea5bbbd291ab6634a497038d30df57d0a
Merge: db156c7 4924a1b
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 8 08:21:55 2012 -0700

    am 4924a1b0: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '4924a1b027a1536c9dbd45497d54947f454f5232':

commit 4924a1b027a1536c9dbd45497d54947f454f5232
Merge: e71b164 76022e2
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 8 08:18:19 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I7f4db4d3a8b8db81a6a6c720b0ae3ded73db0825

commit db156c71c69b348ad0a1d454d35a3dd936a29804
Merge: dd9018e e71b164
Author: Makoto Onuki <omakoto@google.com>
Date:   Tue Aug 7 16:30:27 2012 -0700

    am e71b1644: am b654c68a: [provider] Clean up unused code used to use for....

    * commit 'e71b1644aa029820585ae00cc38c0b0d32906e1d':
      [provider] Clean up unused code used to use for....

commit e71b1644aa029820585ae00cc38c0b0d32906e1d
Merge: 3bbf7c7 b654c68
Author: Makoto Onuki <omakoto@google.com>
Date:   Tue Aug 7 16:28:43 2012 -0700

    am b654c68a: [provider] Clean up unused code used to use for....

    * commit 'b654c68a4d86a74e9751ba6d7007e56803e7c63d':
      [provider] Clean up unused code used to use for....

commit dd9018e58820fcf0b3c31151242c57e129926bb9
Merge: 36fcec4 3bbf7c7
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Aug 2 15:09:20 2012 -0700

    am 3bbf7c7e: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '3bbf7c7e75bb5ab181f778afc193f4fe598b733f':

commit 3bbf7c7e75bb5ab181f778afc193f4fe598b733f
Merge: 9045d1d 88d69a7
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Aug 2 11:27:37 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I2147cf8818d13b0d1fafec4bb7e616c90be02c16

commit 36fcec447a8a904744a91ec748115da6e7d56914
Merge: 3a11503 9045d1d
Author: Nick Kralevich <nnk@google.com>
Date:   Wed Aug 1 10:21:27 2012 -0700

    am 9045d1df: am fce36486: Merge "Explicitly export content providers" into jb-mr1-dev

    * commit '9045d1df57a95b00bf8a10acdf7c5a5bdf52e598':
      Explicitly export content providers

commit 9045d1df57a95b00bf8a10acdf7c5a5bdf52e598
Merge: fd4037d fce3648
Author: Nick Kralevich <nnk@google.com>
Date:   Wed Aug 1 09:56:45 2012 -0700

    am fce36486: Merge "Explicitly export content providers" into jb-mr1-dev

    * commit 'fce3648680415d172605f09170ab16211225f799':
      Explicitly export content providers

commit 3a11503003e63524fa6ed9ec7bebd9294768681b
Merge: e3dd019 fd4037d
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Jul 31 15:06:10 2012 -0700

    am fd4037d2: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'fd4037d219ba5e5cfa8fb6ebe19dd6d375d94ed5':

commit fd4037d219ba5e5cfa8fb6ebe19dd6d375d94ed5
Merge: e3618dc 240a69f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Jul 31 15:04:13 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ia9969cfc45c0b2a9a926cc54d4742f180844bb79

commit e3dd0191a5d70866763b00b3f70ebc8a77626594
Merge: 29a3ed3 e3618dc
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Jul 30 15:33:14 2012 -0700

    am e3618dce: Reconcile with jb-mr1-release

    * commit 'e3618dce22a0ce18c181f33b71213502ac7346db':

commit e3618dce22a0ce18c181f33b71213502ac7346db
Merge: 32067cd 5eb522c
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Jul 30 15:10:40 2012 -0700

    Reconcile with jb-mr1-release

    Change-Id: I46206f9a16be36aa73de64d71f1ae49b9fef0b7d

commit 29a3ed3be96ecbae172d83d55e1457778b8e79a7
Merge: ca42c1a 32067cd
Author: Ying Wang <wangying@google.com>
Date:   Mon Jul 30 15:10:38 2012 -0700

    am 32067cd5: (-s ours) Import translations. DO NOT MERGE

    * commit '32067cd53562f97215eca16a0e0acc39abf32252':
      Import translations. DO NOT MERGE

commit ca42c1ad5aa8c7fb1e69597bd40c3088e177e4ae
Author: Ying Wang <wangying@google.com>
Date:   Mon Jul 30 11:58:57 2012 -0700

    Import translations. DO NOT MERGE

    Change-Id: I636bfe68280d8b2b4c82a770befbf14a371e4af2
    Auto-generated-cl: translation import

Change-Id: I4042ecc15a35b7f5c158e66b8b0b0d8a36e6c6a5