Squashed commit of the following:

commit 270a422efd5744b4b15cecbcfc0c349131d0c767
Author: Yu Ping Hu <yph@google.com>
Date:   Tue May 21 13:49:22 2013 -0700

    Synchronize checkDatabases.

    This function can delete the database while other
    threads are trying to read it, which is bad. The readers
    are already synchronized methods so this should prevent
    that.

    Bug: 8964541
    Change-Id: Ib2f606f274500f0935a5f0211609cf458a0a6005

commit d1fe03924460b1ca09300dc9e6cebf70286c9de1
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon May 6 13:16:30 2013 -0700

    Remove unused resources

    Bug: 8836531
    Change-Id: If2c424a989eddcf79fd9b308f64e79b793482a6d

commit 54c88ffa4c4877057d06c4534f94b9546e29fa72
Author: Yu Ping Hu <yph@google.com>
Date:   Tue Apr 23 10:23:01 2013 -0700

    Show an error on security exception for attachments.

    This uses an existing notification for bad forwarding. The
    text is a bit odd ("Attachment not forwarded") but avoids
    adding new text right now, and at least conveys the error.

    Bug: 8417004
    Change-Id: Id3629a39b2afb583bac2ea6a3ef1303694f1100c

commit 07dc1918deeb3228ded979749b495096ea456d05
Author: Yu Ping Hu <yph@google.com>
Date:   Mon Apr 15 16:42:44 2013 -0700

    Opt out Email from limited users.

    Bug: 8620868
    Change-Id: Ic334392342a9be729c5214a9e099a6d7180c5b52

commit 5ab92ca4b25e293aaa3eda77856ec02631784d6f
Author: Paul Westbrook <pwestbro@google.com>
Date:   Sat Apr 13 00:48:15 2013 -0700

    Ensure security policy notifications are shown

    Cherry-pick of https://googleplex-android-review.googlesource.com/218352

    Bug: 8510828
    Change-Id: I29e5abe265adc29ae3e291155b14a8cfc7c7f250

commit 3de35b4644a4ce98825a12cc22b0b3e72e76e927
Author: Paul Westbrook <pwestbro@google.com>
Date:   Fri Apr 5 13:57:51 2013 -0700

    Fix to make POP and Imap more locale safe

    Cherry-picks from:
    https://android-review.googlesource.com/#/c/42334/
    https://android-review.googlesource.com/#/c/42332/

    Bug: 7138507

    Change-Id: I557c3d8c725cf6dc4f13f227dcec63864ab5db67

commit 5208ebea4bbf572faab210959b774298954396d7
Author: Paul Westbrook <pwestbro@google.com>
Date:   Tue Apr 2 11:36:11 2013 -0700

    Fix IMAP sync with Arabic language

    Email shouldn't rely on the the default locale.
    See: http://developer.android.com/reference/java/util/Locale.html#default_locale

    Bug: 7138507

    cherry-pick of https://googleplex-android-review.googlesource.com/#/c/291639/1

    Change-Id: Ia2c6eccc6dee011f4e7e7c663a0328d4fd76131b

commit ae9bf5d8e53fe6376d44b3b1c3699d30d9dc2986
Merge: 2a76620 e6f2da8
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 13:44:26 2013 -0700

    am e6f2da87: am 95989f8e: am eb137dc8: am f92780b7: (-s ours) am b60c1ed9: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'e6f2da87329fa2d4e109498873610038808d0d78':

commit e6f2da87329fa2d4e109498873610038808d0d78
Merge: b3c37a3 95989f8
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 13:13:31 2013 -0700

    am 95989f8e: am eb137dc8: am f92780b7: (-s ours) am b60c1ed9: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '95989f8eea2a6804fb63465dde4b8a1c39a91c8a':

commit 95989f8eea2a6804fb63465dde4b8a1c39a91c8a
Merge: 5bea15c eb137dc
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 13:00:36 2013 -0700

    am eb137dc8: am f92780b7: (-s ours) am b60c1ed9: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'eb137dc8d7a8695f1164052b63118793bf1d7b82':

commit eb137dc8d7a8695f1164052b63118793bf1d7b82
Merge: 4c13e1c f92780b
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 12:41:58 2013 -0700

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

    * commit 'f92780b703f13af4c8379f23227f231ec125b229':

commit f92780b703f13af4c8379f23227f231ec125b229
Merge: 4c13e1c b60c1ed
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 12:27:40 2013 -0700

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

    * commit 'b60c1ed9e50c49477166353b08fd205c98db8b6e':

commit b60c1ed9e50c49477166353b08fd205c98db8b6e
Merge: 5c5d3c6 883b766
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 12:21:24 2013 -0700

    Reconcile with jb-mr1-release - do not merge

commit 2a76620734b726474b7e1a5cdd2f5c907f213064
Merge: 1de7ca7 b3c37a3
Author: Elliott Hughes <enh@google.com>
Date:   Sat Mar 2 00:22:04 2013 +0000

    am b3c37a31: Merge "email: "Exchange Services has stopped" - Rain of Exchange Javacrashes"

    * commit 'b3c37a31ccffe137cc9b1c1068bb99d3d00a2ee4':
      email: "Exchange Services has stopped" - Rain of Exchange Javacrashes

commit 1de7ca72443154267579d75eb61fd2dbdd72ea37
Merge: ee7304c 3fa230f
Author: Elliott Hughes <enh@google.com>
Date:   Sat Mar 2 00:22:03 2013 +0000

    am 3fa230f1: Merge "Force close_crash happened when add new mail from Email widget"

    * commit '3fa230f17522352caa3ee239c6d846fac273082a':
      Force close_crash happened when add new mail from Email widget

commit b3c37a31ccffe137cc9b1c1068bb99d3d00a2ee4
Merge: 3fa230f b0b969f
Author: Elliott Hughes <enh@google.com>
Date:   Fri Mar 1 23:52:12 2013 +0000

    Merge "email: "Exchange Services has stopped" - Rain of Exchange Javacrashes"

commit 3fa230f17522352caa3ee239c6d846fac273082a
Merge: e22c8b7 2bfb8cc
Author: Elliott Hughes <enh@google.com>
Date:   Fri Mar 1 23:51:44 2013 +0000

    Merge "Force close_crash happened when add new mail from Email widget"

commit ee7304cfe0a447130250c62647ae6978ec30d546
Merge: d391bfa ffc1b54
Author: Ed Heyl <edheyl@google.com>
Date:   Wed Feb 20 13:47:32 2013 -0800

    Merge remote-tracking branch 'goog/jb-mr2-release'

commit ffc1b5444618738a36a71c11b2c9166a6521739f
Merge: d391bfa 891940b
Author: The Android Automerger <android-build@android.com>
Date:   Wed Feb 13 05:56:17 2013 -0800

    merge in jb-mr2-release history after reset to master

commit d391bfa94b51fbd1e7538931fbdca3273b8529d5
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Feb 12 13:01:56 2013 -0800

    Import translations. DO NOT MERGE

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

commit 891940b24ca9d0497427e8c96254b0fe5957d7f6
Merge: a75f80b 4a3fcce
Author: The Android Automerger <android-build@android.com>
Date:   Mon Feb 11 07:11:48 2013 -0800

    merge in jb-mr2-release history after reset to master

commit a75f80b2ffe5d3ea15606e7d2102676b7438def1
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Feb 8 11:41:22 2013 -0800

    Import translations. DO NOT MERGE

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

commit da9c186c43d71c173571147f4c627e35a898364f
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Feb 6 15:27:21 2013 -0800

    Import translations. DO NOT MERGE

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

commit 4a3fcce4c3adaacbac4dfab2a1724cfa954b9cf2
Merge: 9545c17 65869ed
Author: The Android Automerger <android-build@android.com>
Date:   Wed Feb 6 07:11:13 2013 -0800

    merge in jb-mr2-release history after reset to master

commit 9545c177b0acd56d1a1effcfef96fe0bbb4ead3e
Merge: ae54c55 e22c8b7
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Feb 5 13:38:33 2013 -0800

    am e22c8b7e: (-s ours) Reconcile with jb-mr1.1-release - do not merge

    # Via The Android Automerger (3) and The Android Open Source Project (1)
    * commit 'e22c8b7ec78c3c5ed0a42e331378c0ffc15d5c42':

commit e22c8b7ec78c3c5ed0a42e331378c0ffc15d5c42
Merge: dc845f2 0f6f04f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Feb 5 13:36:26 2013 -0800

    Reconcile with jb-mr1.1-release - do not merge

    Change-Id: I0ef140d90408b238a766c8f524ebda617ffa5edd

commit ae54c554da618f0f5898db201740c07572584e77
Merge: c33d95e 2ed13bc
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Feb 5 20:15:03 2013 +0000

    Merge "Import translations. DO NOT MERGE"

commit 65869ed9667045f0bacf8f03ea759a0180c204ac
Merge: c33d95e f5d7747
Author: The Android Automerger <android-build@android.com>
Date:   Tue Feb 5 07:11:11 2013 -0800

    merge in jb-mr2-release history after reset to master

commit c33d95eb4d277180304224c41cfef303500063c4
Merge: 0b7bbe4 dc845f2
Author: Vikram Aggarwal <viki@google.com>
Date:   Mon Feb 4 16:43:46 2013 -0800

    am dc845f28: am 5bea15c4: am 4c13e1cf: Make subject in actionbar smaller.

    # Via Android Git Automerger (2) and Vikram Aggarwal (1)
    * commit 'dc845f281d57f6bceeba12e770bfdddf964ae7e5':
      Make subject in actionbar smaller.

commit 2ed13bcefe562a3387fe9c289c9660ac14616088
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Feb 4 10:30:42 2013 -0800

    Import translations. DO NOT MERGE

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

commit dc845f281d57f6bceeba12e770bfdddf964ae7e5
Merge: cdd24ef 5bea15c
Author: Vikram Aggarwal <viki@google.com>
Date:   Mon Feb 4 09:07:58 2013 -0800

    am 5bea15c4: am 4c13e1cf: Make subject in actionbar smaller.

    # Via Android Git Automerger (1) and Vikram Aggarwal (1)
    * commit '5bea15c4902bde908f5c2cb5f465c70e2b8fb73e':
      Make subject in actionbar smaller.

commit f5d7747423997b7ea3555b962de61811ca85885f
Merge: 0b7bbe4 267048c
Author: The Android Automerger <android-build@android.com>
Date:   Mon Feb 4 07:11:02 2013 -0800

    merge in jb-mr2-release history after reset to master

commit 5bea15c4902bde908f5c2cb5f465c70e2b8fb73e
Merge: c83212a 4c13e1c
Author: Vikram Aggarwal <viki@google.com>
Date:   Fri Feb 1 17:49:15 2013 -0800

    am 4c13e1cf: Make subject in actionbar smaller.

    # Via Vikram Aggarwal
    * commit '4c13e1cf4ac82d53093c99ecedf83fee738e8af8':
      Make subject in actionbar smaller.

commit 0b7bbe43e8ea0efded20d38132c064cbbf489df7
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Feb 1 09:15:05 2013 -0800

    Import translations. DO NOT MERGE

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

commit 267048c2bee8c0d9d0b60ae98571474c4c9ad3d5
Merge: 0a93f31 1489f9b
Author: The Android Automerger <android-build@android.com>
Date:   Thu Jan 31 07:10:49 2013 -0800

    merge in jb-mr2-release history after reset to master

commit 0a93f31db2e0f8225551339ce5713712f631ba62
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Jan 30 11:25:31 2013 -0800

    Import translations. DO NOT MERGE

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

commit 1489f9b0daeacc3c254435579fadf557ec989619
Merge: e9b5845 d5b2c83
Author: The Android Automerger <android-build@android.com>
Date:   Tue Jan 29 07:10:55 2013 -0800

    merge in jb-mr2-release history after reset to master

commit e9b584590adba921c0ecd961dc51c0868430264b
Merge: 9104731 cdd24ef
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Jan 28 11:05:14 2013 -0800

    am cdd24efe: am c83212a7: am 09a09623: Use standard actionbar when possible

    # Via Android Git Automerger (2) and Paul Westbrook (1)
    * commit 'cdd24efe7cfda8f69c6d30efa84d9f43666fb9d8':
      Use standard actionbar when possible

commit cdd24efe7cfda8f69c6d30efa84d9f43666fb9d8
Merge: 1f8b7a9 c83212a
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Jan 28 11:02:49 2013 -0800

    am c83212a7: am 09a09623: Use standard actionbar when possible

    # Via Android Git Automerger (1) and Paul Westbrook (1)
    * commit 'c83212a7dd379bfb903785d5b5a058d4beaee48c':
      Use standard actionbar when possible

commit c83212a7dd379bfb903785d5b5a058d4beaee48c
Merge: e7f8560 09a0962
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Jan 28 11:00:03 2013 -0800

    am 09a09623: Use standard actionbar when possible

    # Via Paul Westbrook
    * commit '09a09623952011e72b28d0fd3e6b9845477a6a52':
      Use standard actionbar when possible

commit d5b2c832e65cd738ddcf602a7fe757f3a0952675
Merge: 9104731 a5fbbc4
Author: The Android Automerger <android-build@android.com>
Date:   Thu Jan 24 07:10:33 2013 -0800

    merge in jb-mr2-release history after reset to master

commit 9104731f7a2f9956299c11c1641e5d0df7272d54
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Jan 23 12:19:34 2013 -0800

    Import translations. DO NOT MERGE

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

commit a5fbbc422a9012e13fc257d465b3ecb5c9e66acd
Merge: 3f4b04f fb12907
Author: The Android Automerger <android-build@android.com>
Date:   Mon Jan 21 07:10:43 2013 -0800

    merge in jb-mr2-release history after reset to master

commit 3f4b04ffc47b525fa479af8679b5fc00ad9f1040
Merge: 17b2e8e 1f8b7a9
Author: Andy Huang <ath@google.com>
Date:   Fri Jan 18 14:01:50 2013 -0800

    am 1f8b7a9e: am e7f8560c: am ed060515: alias clicks on inert ActionBar modes to \'up\' action

    * commit '1f8b7a9ea4f720729e5f6d5e6e0f97c21aca1821':
      alias clicks on inert ActionBar modes to 'up' action

commit 1f8b7a9ea4f720729e5f6d5e6e0f97c21aca1821
Merge: 7393705 e7f8560
Author: Andy Huang <ath@google.com>
Date:   Fri Jan 18 11:40:12 2013 -0800

    am e7f8560c: am ed060515: alias clicks on inert ActionBar modes to \'up\' action

    * commit 'e7f8560c6ca770124946fd9156ace81062c32df1':
      alias clicks on inert ActionBar modes to 'up' action

commit e7f8560c6ca770124946fd9156ace81062c32df1
Merge: 56a6fad ed06051
Author: Andy Huang <ath@google.com>
Date:   Fri Jan 18 11:33:07 2013 -0800

    am ed060515: alias clicks on inert ActionBar modes to \'up\' action

    * commit 'ed060515f11fd22b2f8e32eacab28a720ea552ca':
      alias clicks on inert ActionBar modes to 'up' action

commit fb12907212034831e25f914259b81a3f042fb9a7
Merge: 17b2e8e 48ec811
Author: The Android Automerger <android-build@android.com>
Date:   Thu Jan 10 07:49:53 2013 -0800

    merge in master-release history after reset to master

commit 17b2e8ee251c919893691f9c2a3cc7ae19f34c0f
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Jan 9 12:31:56 2013 -0800

    Import translations. DO NOT MERGE

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

commit 48ec8111e52b76d7d12bd0383febe3e651c0cbe1
Merge: 9ea98f1 7fc85fa
Author: The Android Automerger <android-build@android.com>
Date:   Wed Jan 9 07:49:49 2013 -0800

    merge in master-release history after reset to master

commit 9ea98f17affcfa439532d225e0f9c4e110cceaf2
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Jan 7 10:59:06 2013 -0800

    Import translations. DO NOT MERGE

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

commit 7fc85fa3753d865ef29c2bd7e091b10488343f69
Merge: 4392d2f af6ea47
Author: The Android Automerger <android-build@android.com>
Date:   Fri Jan 4 07:49:46 2013 -0800

    merge in master-release history after reset to master

commit 4392d2f09ba76496deac6bf2c13833a770f2236a
Author: Scott Kennedy <skennedy@google.com>
Date:   Thu Jan 3 10:50:13 2013 -0800

    Prevent an Email widget crash

    Bug: 7937753
    Change-Id: Ie01a29e6dfc1e4447f665a4ee4eab5ebbf6a1e45

commit af6ea472344efab764b744ab1a2f20ab965bb250
Merge: 642530c 40fbf6e
Author: The Android Automerger <android-build@android.com>
Date:   Thu Jan 3 07:50:00 2013 -0800

    merge in master-release history after reset to master

commit 642530cc99f8dc7c743da3ac1ee971138f924f49
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Jan 2 10:42:58 2013 -0800

    Import translations. DO NOT MERGE

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

commit 890903d5b28c914227ab0e33a9acd8a437f3ca13
Merge: 8806857 7393705
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Dec 5 13:00:56 2012 -0800

    am 73937056: (-s ours) Reconcile with jb-mr1.1-release - do not merge

    * commit '73937056d9870d5c13c1a826f6c3a8891363c88f':

commit 73937056d9870d5c13c1a826f6c3a8891363c88f
Merge: 4142f70 0d7d7ab
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Dec 5 11:09:22 2012 -0800

    Reconcile with jb-mr1.1-release - do not merge

    Change-Id: I542ccd948f3a80e402ce6d80e8951091c8e07001

commit 40fbf6e9d3994979f9e407165e193dd4c4883f0b
Merge: 8806857 fe5f19d
Author: The Android Automerger <android-build@android.com>
Date:   Wed Dec 5 07:50:08 2012 -0800

    merge in master-release history after reset to master

commit 2bfb8ccd8507125aa6b5844e62af8e3fd234ffd7
Author: Erjun Ding <erjunx.ding@intel.com>
Date:   Thu May 17 18:43:50 2012 +0800

    Force close_crash happened when add new mail from Email widget

    rootcause: The widget store a email account id when Launcher add a email widget.
    If the email account is removed, but the widget acount id is still exsit.

    Change-Id: I4b18e19506ed6afe5d24ab44585cd58c37e221f0
    Author: Erjun Ding <erjunx.ding@intel.com>
    Signed-off-by: Erjun Ding <erjunx.ding@intel.com>
    Signed-off-by: Shuo Gao <shuo.gao@intel.com>
    Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
    Signed-off-by: Jack Ren <jack.ren@intel.com>
    Author-tracking-BZ: 36835

commit b0b969fac6c60fc9d5ca1ca3c506162ccd466498
Author: Emmanuel Berthier <emmanuel.berthier@intel.com>
Date:   Thu Oct 11 16:33:25 2012 +0200

    email: "Exchange Services has stopped" - Rain of Exchange Javacrashes

    Cleanup some nasty records containing NULL fields.

    Change-Id: Iec5e7e1bebc4beee8fa010c3f9c9ee723fd2cd83
    Author: Emmanuel Berthier <emmanuel.berthier@intel.com>
    Signed-off-by: Shuo Gao <shuo.gao@intel.com>
    Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
    Signed-off-by: Jack Ren <jack.ren@intel.com>
    Author-tracking-BZ: 60461

commit 8806857c63d32b72f25c5d348f8d0ecc1b0ff847
Merge: 8f6e35b 4142f70
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Dec 4 07:55:41 2012 -0800

    am 4142f70c: (-s ours) am 56a6fad3: am 7abcd22d: Import translations. DO NOT MERGE

    * commit '4142f70c5836f0b2830a3d22a02cc6781084bd5b':
      Import translations. DO NOT MERGE

commit 8f6e35b2856a6dc43db294397304dd27d72982af
Merge: 9520715 20ff2d0
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Dec 4 07:55:40 2012 -0800

    am 20ff2d03: (-s ours) am 9cb4e104: Import translations. DO NOT MERGE

    * commit '20ff2d03f94b944996e1b5c5ce07c163d81aee47':
      Import translations. DO NOT MERGE

commit 4142f70c5836f0b2830a3d22a02cc6781084bd5b
Merge: 20ff2d0 56a6fad
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Dec 4 07:53:13 2012 -0800

    am 56a6fad3: am 7abcd22d: Import translations. DO NOT MERGE

    * commit '56a6fad31e4053d1b0aeb8522aee05f09f5ac6a0':
      Import translations. DO NOT MERGE

commit 20ff2d03f94b944996e1b5c5ce07c163d81aee47
Merge: 713fb9f 9cb4e10
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Dec 4 07:53:12 2012 -0800

    am 9cb4e104: Import translations. DO NOT MERGE

    * commit '9cb4e1044002f73f5b2935eb5826a9a498fc3144':
      Import translations. DO NOT MERGE

commit 56a6fad31e4053d1b0aeb8522aee05f09f5ac6a0
Merge: 9cb4e10 7abcd22
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Dec 4 07:51:53 2012 -0800

    am 7abcd22d: Import translations. DO NOT MERGE

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

commit 9520715f36b1e47baced37c4d4668d0b50908322
Merge: c47bf3a 86bfeff
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Dec 4 07:49:19 2012 -0800

    Merge "Import translations. DO NOT MERGE"

commit c47bf3ab3d0afb28d4631c898217bf8db37d0b7c
Merge: 0d54bc2 713fb9f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Dec 3 11:36:47 2012 -0800

    am 713fb9fd: (-s ours) Reconcile with jb-mr1.1-release - do not merge

    * commit '713fb9fd596c9c0e3c2021f7b1f69bec12a1e93d':

commit 713fb9fd596c9c0e3c2021f7b1f69bec12a1e93d
Merge: 7520442 0d3751c
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Dec 3 11:34:30 2012 -0800

    Reconcile with jb-mr1.1-release - do not merge

    Change-Id: I4520610c65057a87aaaf270c1cd84fffaf91d7e5

commit 86bfefff0b79416f6e370aa4a5dc76b09379af45
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Dec 3 09:12:51 2012 -0800

    Import translations. DO NOT MERGE

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

commit 9cb4e1044002f73f5b2935eb5826a9a498fc3144
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Dec 3 09:08:18 2012 -0800

    Import translations. DO NOT MERGE

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

commit fe5f19d6d8a7f7837fce2cfd657d3a5206101154
Merge: 0d54bc2 693a019
Author: The Android Automerger <android-build@android.com>
Date:   Fri Nov 30 07:50:32 2012 -0800

    merge in master-release history after reset to master

commit 0d54bc21d49ed11304e891fb079bcaf61b6bd4c6
Merge: bcf7d10 7520442
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Nov 29 15:44:35 2012 -0800

    am 75204426: (-s ours) Reconcile with jb-mr1.1-release - do not merge

    * commit '752044261f170477bfcc5d0684526c4061299fa3':

commit 752044261f170477bfcc5d0684526c4061299fa3
Merge: 612e513 6a59dca
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Nov 29 15:41:34 2012 -0800

    Reconcile with jb-mr1.1-release - do not merge

    Change-Id: I12e03896390996549ed7bb210df226b99d4de21d

commit bcf7d100f7bf900b147caa63225b6d92a8b3accb
Merge: 1eddd3f 612e513
Author: Scott Kennedy <skennedy@google.com>
Date:   Thu Nov 29 15:15:26 2012 -0800

    am 612e5137: am 7e0c0bc7: am 3c0b8eea: Change Email vibrate setting from tri-state to checkbox

    * commit '612e51375f00a71ff6d283d75c70ee1f1011858a':
      Change Email vibrate setting from tri-state to checkbox

commit 1eddd3faa4c46e13d445869bf32d5725f5f20f78
Merge: b85410d 5f48368
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Nov 29 14:37:25 2012 -0800

    am 5f48368d: am 36bcc2e2: am 4124f4a4: Merge "Specify a timeout for the connection handshake" into jb-mr1.1-dev

    * commit '5f48368d159ae0ad3b3b306fce624ba701139ace':
      Specify a timeout for the connection handshake

commit b85410d4f28c94564efa9b8e3dc30f966020c9f8
Merge: 99d880d 3ebd1b0
Author: Scott Kennedy <skennedy@google.com>
Date:   Thu Nov 29 14:37:23 2012 -0800

    am 3ebd1b03: am 171cd067: am 978959e6: Do not vibrate in vibrate mode if ringtone is silent

    * commit '3ebd1b038bd494f4356c7df9020ac6f7f9f50cbb':
      Do not vibrate in vibrate mode if ringtone is silent

commit 612e51375f00a71ff6d283d75c70ee1f1011858a
Merge: 5f48368 7e0c0bc
Author: Scott Kennedy <skennedy@google.com>
Date:   Thu Nov 29 14:33:22 2012 -0800

    am 7e0c0bc7: am 3c0b8eea: Change Email vibrate setting from tri-state to checkbox

    * commit '7e0c0bc73166d7161409645174cbd67667a14b95':
      Change Email vibrate setting from tri-state to checkbox

commit 5f48368d159ae0ad3b3b306fce624ba701139ace
Merge: 3ebd1b0 36bcc2e
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Nov 29 14:27:46 2012 -0800

    am 36bcc2e2: am 4124f4a4: Merge "Specify a timeout for the connection handshake" into jb-mr1.1-dev

    * commit '36bcc2e29ab36ae3626443bd12ad173b0ed08808':
      Specify a timeout for the connection handshake

commit 7e0c0bc73166d7161409645174cbd67667a14b95
Merge: 36bcc2e 3c0b8ee
Author: Scott Kennedy <skennedy@google.com>
Date:   Thu Nov 29 14:27:35 2012 -0800

    am 3c0b8eea: Change Email vibrate setting from tri-state to checkbox

    * commit '3c0b8eeaeb194de986f8adf2fd882080938afd37':
      Change Email vibrate setting from tri-state to checkbox

commit 3ebd1b038bd494f4356c7df9020ac6f7f9f50cbb
Merge: f2af754 171cd06
Author: Scott Kennedy <skennedy@google.com>
Date:   Thu Nov 29 14:27:07 2012 -0800

    am 171cd067: am 978959e6: Do not vibrate in vibrate mode if ringtone is silent

    * commit '171cd0678008a48ce281f2f9b631108bc27dbefd':
      Do not vibrate in vibrate mode if ringtone is silent

commit 36bcc2e29ab36ae3626443bd12ad173b0ed08808
Merge: 171cd06 4124f4a
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Nov 29 10:07:50 2012 -0800

    am 4124f4a4: Merge "Specify a timeout for the connection handshake" into jb-mr1.1-dev

    * commit '4124f4a40e1fef90df0dec243ecd9bcdbb911738':
      Specify a timeout for the connection handshake

commit 171cd0678008a48ce281f2f9b631108bc27dbefd
Merge: 3f893f7 978959e
Author: Scott Kennedy <skennedy@google.com>
Date:   Wed Nov 28 19:54:30 2012 -0800

    am 978959e6: Do not vibrate in vibrate mode if ringtone is silent

    * commit '978959e6199410419792e89fcea16413f56aeb12':
      Do not vibrate in vibrate mode if ringtone is silent

commit 99d880df6bc4bcc717f091d09db8569e73462db7
Merge: 42e03ca f2af754
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 27 07:46:36 2012 -0800

    am f2af7545: (-s ours) Reconcile with jb-mr1.1-release - do not merge

    * commit 'f2af7545c711c2aac5231105f5b4642cd73d2349':
      Fix Email Widget crash.

commit f2af7545c711c2aac5231105f5b4642cd73d2349
Merge: 7207cbf ec2f232
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 27 07:43:31 2012 -0800

    Reconcile with jb-mr1.1-release - do not merge

    Change-Id: Id52b432c9ba02c838fbf4a80ae6353921ef035d3

commit 693a019b49b5aaf9beeaeeb06be84076b79d2730
Merge: 42e03ca 662dd67
Author: The Android Automerger <android-build@android.com>
Date:   Fri Nov 23 07:49:37 2012 -0800

    merge in master-release history after reset to master

commit 42e03cad1e70e5e6acf630bd849b0021096aa9eb
Merge: 740b864 7207cbf
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Nov 22 10:51:05 2012 -0800

    am 7207cbf2: (-s ours) am 3f893f7b: am b746309a: Import translations. DO NOT MERGE

    * commit '7207cbf2c27afe3cd19029905ead701130b43a0a':
      Import translations. DO NOT MERGE

commit 740b864610a25983dc6f009eb78347da423a33c1
Merge: 73ac281 5110111
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Nov 22 10:49:36 2012 -0800

    am 5110111b: (-s ours) am 117317ee: Import translations. DO NOT MERGE

    * commit '5110111bab9e840c9aeb6f47fcc28dda8a9b0428':
      Import translations. DO NOT MERGE

commit 7207cbf2c27afe3cd19029905ead701130b43a0a
Merge: 5110111 3f893f7
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Nov 22 10:49:10 2012 -0800

    am 3f893f7b: am b746309a: Import translations. DO NOT MERGE

    * commit '3f893f7b449133935fa8997b5e602d2587546afc':
      Import translations. DO NOT MERGE

commit 5110111bab9e840c9aeb6f47fcc28dda8a9b0428
Merge: a245101 117317e
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Nov 22 10:47:39 2012 -0800

    am 117317ee: Import translations. DO NOT MERGE

    * commit '117317ee1891c6daf07bfcdec7ffab2e0f7f74b6':
      Import translations. DO NOT MERGE

commit 3f893f7b449133935fa8997b5e602d2587546afc
Merge: 117317e b746309
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Nov 22 10:47:37 2012 -0800

    am b746309a: Import translations. DO NOT MERGE

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

commit 73ac281a6b2bf1058e21cca49854da82a86c7c51
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Nov 20 21:52:29 2012 -0800

    Import translations. DO NOT MERGE

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

commit 117317ee1891c6daf07bfcdec7ffab2e0f7f74b6
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Nov 20 21:48:20 2012 -0800

    Import translations. DO NOT MERGE

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

commit 662dd67ddf52a59a2b1927a35490e38bf898d621
Merge: b72b096 8c1f615
Author: The Android Automerger <android-build@android.com>
Date:   Mon Nov 19 07:50:23 2012 -0800

    merge in master-release history after reset to master

commit b72b096e13c7a8b9dc4ec14a44b8cc5143068de5
Merge: 7904b47 a245101
Author: Mark Wei <markwei@google.com>
Date:   Fri Nov 16 16:00:55 2012 -0800

    am a2451017: am 83faa4b6: am 3e7b0c11: Fix Email Widget crash.

    * commit 'a2451017c6c5ceb8dbf297a897647bb084f1f56d':
      Fix Email Widget crash.

commit a2451017c6c5ceb8dbf297a897647bb084f1f56d
Merge: f879c86 83faa4b
Author: Mark Wei <markwei@google.com>
Date:   Fri Nov 16 15:59:10 2012 -0800

    am 83faa4b6: am 3e7b0c11: Fix Email Widget crash.

    * commit '83faa4b630a4e49bbe95049bad7b2cc8d42ff5f9':
      Fix Email Widget crash.

commit 83faa4b630a4e49bbe95049bad7b2cc8d42ff5f9
Merge: e58e81d 3e7b0c1
Author: Mark Wei <markwei@google.com>
Date:   Fri Nov 16 15:57:08 2012 -0800

    am 3e7b0c11: Fix Email Widget crash.

    * commit '3e7b0c111c74dc35004e6ba6bca57ad942668425':
      Fix Email Widget crash.

commit 7904b4788b998ddac6c72f783abf802c0c2d0f2a
Merge: 44f6c67 f879c86
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Nov 16 15:19:03 2012 -0800

    am f879c86c: (-s ours) am e58e81d9: am de4a6310: Import translations. DO NOT MERGE

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

commit 44f6c678017683c701b42f3db084eeb8faf592d5
Merge: b2ea277 30f2fc6
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Nov 16 15:16:14 2012 -0800

    am 30f2fc6a: (-s ours) am 7d276e37: Import translations. DO NOT MERGE

    * commit '30f2fc6a29ac819522ba70fa76135f86ad94a0dd':
      Import translations. DO NOT MERGE

commit f879c86ca458f235e58911904401d055d6a632b1
Merge: 30f2fc6 e58e81d
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Nov 16 15:15:46 2012 -0800

    am e58e81d9: am de4a6310: Import translations. DO NOT MERGE

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

commit e58e81d943b65e9334b39d0eb204c2e1a530a2ba
Merge: 7d276e3 de4a631
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Nov 16 15:12:58 2012 -0800

    am de4a6310: Import translations. DO NOT MERGE

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

commit 30f2fc6a29ac819522ba70fa76135f86ad94a0dd
Merge: 2701336 7d276e3
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Nov 16 15:12:55 2012 -0800

    am 7d276e37: Import translations. DO NOT MERGE

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

commit b2ea27743efb8f1751008d3bbc9fedf3a4e263f2
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Nov 16 12:55:08 2012 -0800

    Import translations. DO NOT MERGE

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

commit 7d276e3787df8c9b8423b559478e5cd958eed689
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Nov 16 12:50:55 2012 -0800

    Import translations. DO NOT MERGE

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

commit 8ee3338cbdb0b2447c770b228414fb07147583d9
Merge: 357f4ce 2701336
Author: Mark Wei <markwei@google.com>
Date:   Fri Nov 16 10:42:56 2012 -0800

    am 27013361: am f1330cd7: am a1f20122: Fix build caused by https://googleplex-android-review.googlesource.com/#/c/252374/

    * commit '27013361fd6c8256308c962a3584c4ea27b19c2b':
      Fix build caused by https://googleplex-android-review.googlesource.com/#/c/252374/

commit 357f4ce14247083381a105ccfcf65520c97d7e00
Merge: 358aba9 cae40ad
Author: Mark Wei <markwei@google.com>
Date:   Fri Nov 16 10:38:15 2012 -0800

    am cae40ad7: am d35ca002: am d5f267ed: Email Widget will use startActivity instead of startService so that it works correctly from the keyguard.

    * commit 'cae40ad7192d6862db0f5ed664bb090c9cc3105a':
      Email Widget will use startActivity instead of startService so that it works correctly from the keyguard.

commit 358aba90495bf24d75a9cfb2718cd3ad7ac29483
Merge: af6d5dd 07981f4
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Nov 16 10:36:29 2012 -0800

    am 07981f4a: (-s ours) am de7f96ef: am 6ca495de: Import translations. DO NOT MERGE

    * commit '07981f4a55357e654f67801792d96abd187f4a62':
      Import translations. DO NOT MERGE

commit af6d5dd8577fb1c1ead8330434bf243fa0b70d1c
Merge: e4bc899 553f4c7
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Nov 16 10:36:28 2012 -0800

    am 553f4c76: (-s ours) am 5d11a94e: Import translations. DO NOT MERGE

    * commit '553f4c7676c9586754d44a61389f15420bc08db9':
      Import translations. DO NOT MERGE

commit 8c1f615886a372f4bf7cdfbaaf95dad1cc7bb43f
Merge: e4bc899 7e8647a
Author: The Android Automerger <android-build@android.com>
Date:   Fri Nov 16 07:49:48 2012 -0800

    merge in master-release history after reset to master

commit 27013361fd6c8256308c962a3584c4ea27b19c2b
Merge: cae40ad f1330cd
Author: Mark Wei <markwei@google.com>
Date:   Thu Nov 15 16:15:14 2012 -0800

    am f1330cd7: am a1f20122: Fix build caused by https://googleplex-android-review.googlesource.com/#/c/252374/

    * commit 'f1330cd7a0a7a1d5033651fd76365fa17488e91c':
      Fix build caused by https://googleplex-android-review.googlesource.com/#/c/252374/

commit f1330cd7a0a7a1d5033651fd76365fa17488e91c
Merge: d35ca00 a1f2012
Author: Mark Wei <markwei@google.com>
Date:   Thu Nov 15 16:12:31 2012 -0800

    am a1f20122: Fix build caused by https://googleplex-android-review.googlesource.com/#/c/252374/

    * commit 'a1f20122c9af99430f78a171e2ad552e0ea2cc63':
      Fix build caused by https://googleplex-android-review.googlesource.com/#/c/252374/

commit cae40ad7192d6862db0f5ed664bb090c9cc3105a
Merge: 07981f4 d35ca00
Author: Mark Wei <markwei@google.com>
Date:   Thu Nov 15 13:53:39 2012 -0800

    am d35ca002: am d5f267ed: Email Widget will use startActivity instead of startService so that it works correctly from the keyguard.

    * commit 'd35ca002e0fb1b8005fdc25fc521791e06faf336':
      Email Widget will use startActivity instead of startService so that it works correctly from the keyguard.

commit d35ca002e0fb1b8005fdc25fc521791e06faf336
Merge: de7f96e d5f267e
Author: Mark Wei <markwei@google.com>
Date:   Thu Nov 15 13:51:10 2012 -0800

    am d5f267ed: Email Widget will use startActivity instead of startService so that it works correctly from the keyguard.

    * commit 'd5f267ed250e7c3c97ca5e6ac1902340771d168c':
      Email Widget will use startActivity instead of startService so that it works correctly from the keyguard.

commit 07981f4a55357e654f67801792d96abd187f4a62
Merge: 553f4c7 de7f96e
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Nov 15 07:55:09 2012 -0800

    am de7f96ef: am 6ca495de: Import translations. DO NOT MERGE

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

commit de7f96efba7d615bc1cbb1f96ef348f41cd8a60c
Merge: 5d11a94 6ca495d
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Nov 15 07:51:57 2012 -0800

    am 6ca495de: Import translations. DO NOT MERGE

    * commit '6ca495de6e8c30fe395a84dcd76375a0650d500b':
      Import translations. DO NOT MERGE

commit 553f4c7676c9586754d44a61389f15420bc08db9
Merge: 35eab7f 5d11a94
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Nov 15 07:51:35 2012 -0800

    am 5d11a94e: Import translations. DO NOT MERGE

    * commit '5d11a94e557ad4a7f64f43825c7001c2e200df7b':
      Import translations. DO NOT MERGE

commit e4bc899a219fa0e726b0e7fe666a8955db4f81ef
Merge: 16b2fb0 222d395
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Nov 15 07:50:11 2012 -0800

    Merge "Import translations. DO NOT MERGE"

commit 16b2fb0102c1f75f6a469424c54bbe4c6fe6485b
Merge: 60351b6 35eab7f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Nov 14 12:45:00 2012 -0800

    am 35eab7fd: (-s ours) Reconcile with jb-mr1.1-release - do not merge

    * commit '35eab7fde0e9bb838576450e0d7b47652b2c50c8':

commit 35eab7fde0e9bb838576450e0d7b47652b2c50c8
Merge: 2b3b30b e7816fa
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Nov 14 12:41:18 2012 -0800

    Reconcile with jb-mr1.1-release - do not merge

    Change-Id: I6e06d136fcabc569e29ba733ef40a8895b678c46

commit 222d39577081346312eb498aac369b48a42881e0
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Nov 14 08:37:50 2012 -0800

    Import translations. DO NOT MERGE

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

commit 5d11a94e557ad4a7f64f43825c7001c2e200df7b
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Nov 14 08:32:51 2012 -0800

    Import translations. DO NOT MERGE

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

commit 7e8647a323ce574d1f6454cb97c236c6a10f0857
Merge: 60351b6 5d81ce4
Author: The Android Automerger <android-build@android.com>
Date:   Tue Nov 13 07:50:09 2012 -0800

    merge in master-release history after reset to master

commit 60351b627f2ff77077d56da20b459ac9dec9c615
Merge: fae7c82 2b3b30b
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Nov 12 10:41:31 2012 -0800

    am 2b3b30bb: (-s ours) am a965f735: Import translations. DO NOT MERGE

    * commit '2b3b30bbb5b38cad2411b1914a2df4e13280147f':
      Import translations. DO NOT MERGE

commit 2b3b30bbb5b38cad2411b1914a2df4e13280147f
Merge: ecaa802 a965f73
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Nov 12 10:38:28 2012 -0800

    am a965f735: Import translations. DO NOT MERGE

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

commit 5d81ce4b6d867a8db2a783a96e5c44195fdd7316
Merge: e31121a ddbeaf0
Author: The Android Automerger <android-build@android.com>
Date:   Mon Nov 12 07:50:03 2012 -0800

    merge in master-release history after reset to master

commit fae7c821991484ac1db8a0144daf8c594aec34d9
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Nov 12 07:00:36 2012 -0800

    Import translations. DO NOT MERGE

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

commit a965f7356b366ce0747d618c5294c294ad976552
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Nov 12 06:58:13 2012 -0800

    Import translations. DO NOT MERGE

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

commit e31121aba17734356fc38d7bfc2e77f63fc968c8
Merge: c40000c ecaa802
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Nov 9 22:44:08 2012 -0800

    am ecaa802a: (-s ours) am 9f7c216c: Import translations. DO NOT MERGE

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

commit ecaa802a3585ec8985eefd4c0f13dd4fcedf908c
Merge: c60b1aa 9f7c216
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Nov 9 15:17:06 2012 -0800

    am 9f7c216c: Import translations. DO NOT MERGE

    * commit '9f7c216c2c9e7a23c259992a6ecf09cd49456b9b':
      Import translations. DO NOT MERGE

commit ddbeaf01dc1b11c1361585eddef2783a75917f8b
Merge: c05e45b 93a67e4
Author: The Android Automerger <android-build@android.com>
Date:   Fri Nov 9 07:50:13 2012 -0800

    merge in master-release history after reset to master

commit c40000c53768e94c6d240be159116a97fc900fdc
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Nov 9 07:39:03 2012 -0800

    Import translations. DO NOT MERGE

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

commit 9f7c216c2c9e7a23c259992a6ecf09cd49456b9b
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Nov 9 07:34:56 2012 -0800

    Import translations. DO NOT MERGE

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

commit c05e45be2519d08deec49a8e132c7ccc776b6a1c
Merge: 033c382 c60b1aa
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Nov 8 15:52:11 2012 -0800

    am c60b1aaf: (-s ours) am 12406fc6: am 48c04a27: Reconcile with jb-mr1-release - do not merge

    * commit 'c60b1aaf77e6428eac15d90bb5e53eb17573e069':

commit 033c382b04a57d8159d4ee6c686ab6463de29548
Merge: cc1ae3a f5fe3f1
Author: Mark Wei <markwei@google.com>
Date:   Thu Nov 8 15:52:10 2012 -0800

    am f5fe3f12: am 59d471c8: am b8f3c0e4: am 5c5d3c64: Add content description to Compose button in Widget.

    * commit 'f5fe3f122340fd761075e374b880ff5b0c40a85f':
      Add content description to Compose button in Widget.

commit cc1ae3ac7fc7fb50891e37e604b1f24aa26efb29
Merge: 0fb6bf8 127b9a3
Author: Mark Wei <markwei@google.com>
Date:   Thu Nov 8 15:52:08 2012 -0800

    am 127b9a32: am 0eddd109: am 458816b2: Enable Email Widget on lockscreen. Work around keyguard detection issues.

    * commit '127b9a32edd96003b94d56d282e8487f5c79aa41':
      Enable Email Widget on lockscreen. Work around keyguard detection issues.

commit 0fb6bf8a15470a18c9489fd3900827c9ef8321ef
Merge: a1c1630 7487adb
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Nov 8 15:52:07 2012 -0800

    am 7487adbb: (-s ours) am a1a603bb: am 1785b179: Reconcile with jb-mr1-release - do not merge

    * commit '7487adbbeb9023b358df6dba43d4a05cb746b0fa':

commit c60b1aaf77e6428eac15d90bb5e53eb17573e069
Merge: f5fe3f1 12406fc
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Nov 8 15:44:35 2012 -0800

    am 12406fc6: am 48c04a27: Reconcile with jb-mr1-release - do not merge

    * commit '12406fc6c055ab623ba7e077185aa599b335c71d':

commit f5fe3f122340fd761075e374b880ff5b0c40a85f
Merge: 127b9a3 59d471c
Author: Mark Wei <markwei@google.com>
Date:   Thu Nov 8 15:43:48 2012 -0800

    am 59d471c8: am b8f3c0e4: am 5c5d3c64: Add content description to Compose button in Widget.

    * commit '59d471c8dea53871f867fc205aa276c0623bad9c':
      Add content description to Compose button in Widget.

commit 127b9a32edd96003b94d56d282e8487f5c79aa41
Merge: 7487adb 0eddd10
Author: Mark Wei <markwei@google.com>
Date:   Thu Nov 8 15:43:12 2012 -0800

    am 0eddd109: am 458816b2: Enable Email Widget on lockscreen. Work around keyguard detection issues.

    * commit '0eddd109c0c2c8c909c3442c70a43130399ebfbb':
      Enable Email Widget on lockscreen. Work around keyguard detection issues.

commit 7487adbbeb9023b358df6dba43d4a05cb746b0fa
Merge: daea803 a1a603b
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Nov 8 15:42:16 2012 -0800

    am a1a603bb: am 1785b179: Reconcile with jb-mr1-release - do not merge

    * commit 'a1a603bbfdcd1dfa1d51135b5353129e0edd091d':

commit 12406fc6c055ab623ba7e077185aa599b335c71d
Merge: 59d471c 48c04a2
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Nov 8 08:58:03 2012 -0800

    am 48c04a27: Reconcile with jb-mr1-release - do not merge

    * commit '48c04a2712167e07d12316b042695988d6eccaf3':

commit 93a67e4b654e32ca6cf395280a42a6c2a5c6327a
Merge: b72f362 a792d3d
Author: The Android Automerger <android-build@android.com>
Date:   Thu Nov 8 07:50:23 2012 -0800

    merge in master-release history after reset to master

commit a1c16306b287d95bea161678ff2dbca4866dc73a
Merge: fdfb058 daea803
Author: Mark Wei <markwei@google.com>
Date:   Thu Nov 8 06:32:08 2012 -0800

    am daea8036: am 47c8359a: am 3fea2f1a: am acd8e786: Revert "Enable Email lockscreen widget" https://b.corp.google.com/issue?id=7488437#ISSUE_HistoryHeader13

    * commit 'daea8036276dafcdb24bbece9e9d374886e5601e':
      Revert "Enable Email lockscreen widget" https://b.corp.google.com/issue?id=7488437#ISSUE_HistoryHeader13

commit fdfb058dcd2b3e0eb8bc75850264883592fa1d3b
Merge: b72f362 4753524
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Nov 8 06:32:07 2012 -0800

    am 47535245: (-s ours) am 8207b3a1: am 2159898a: Reconcile with jb-mr1-release - do not merge

    * commit '475352453c60cc55936aebf3d045e12fa140857c':

commit daea8036276dafcdb24bbece9e9d374886e5601e
Merge: 4753524 47c8359
Author: Mark Wei <markwei@google.com>
Date:   Thu Nov 8 06:27:14 2012 -0800

    am 47c8359a: am 3fea2f1a: am acd8e786: Revert "Enable Email lockscreen widget" https://b.corp.google.com/issue?id=7488437#ISSUE_HistoryHeader13

    * commit '47c8359abba486d4c842fd8972dc8233c8cc497d':
      Revert "Enable Email lockscreen widget" https://b.corp.google.com/issue?id=7488437#ISSUE_HistoryHeader13

commit 475352453c60cc55936aebf3d045e12fa140857c
Merge: 3fbb2a4 8207b3a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Nov 8 06:27:07 2012 -0800

    am 8207b3a1: am 2159898a: Reconcile with jb-mr1-release - do not merge

    * commit '8207b3a10f071384c37cfe40f4bf730748662648':

commit b72f3628a6201ea48ffdfc3e4a53412c1df926f5
Merge: 8654d8c 3fbb2a4
Author: Mark Wei <markwei@google.com>
Date:   Thu Nov 8 06:22:00 2012 -0800

    am 3fbb2a47: am 29b0c4e5: am cb800298: am 8c7f8d74: Enable Email lockscreen widget

    * commit '3fbb2a4762e3275b40b9a4f9377551c5cb55af64':
      Enable Email lockscreen widget

commit 3fbb2a4762e3275b40b9a4f9377551c5cb55af64
Merge: b94fb3a 29b0c4e
Author: Mark Wei <markwei@google.com>
Date:   Thu Nov 8 06:14:13 2012 -0800

    am 29b0c4e5: am cb800298: am 8c7f8d74: Enable Email lockscreen widget

    * commit '29b0c4e5f71ad661e232a34b070766ceef5126fd':
      Enable Email lockscreen widget

commit 59d471c8dea53871f867fc205aa276c0623bad9c
Merge: 0eddd10 b8f3c0e
Author: Mark Wei <markwei@google.com>
Date:   Wed Nov 7 18:34:43 2012 -0800

    am b8f3c0e4: am 5c5d3c64: Add content description to Compose button in Widget.

    * commit 'b8f3c0e45424784e27985f53c54ef353fe9f51d3':
      Add content description to Compose button in Widget.

commit 0eddd109c0c2c8c909c3442c70a43130399ebfbb
Merge: a1a603b 458816b
Author: Mark Wei <markwei@google.com>
Date:   Wed Nov 7 16:29:35 2012 -0800

    am 458816b2: Enable Email Widget on lockscreen. Work around keyguard detection issues.

    * commit '458816b2c8c3bc684119adba8126584c45b468e8':
      Enable Email Widget on lockscreen. Work around keyguard detection issues.

commit a1a603bbfdcd1dfa1d51135b5353129e0edd091d
Merge: 47c8359 1785b17
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Nov 7 11:37:22 2012 -0800

    am 1785b179: Reconcile with jb-mr1-release - do not merge

    * commit '1785b179440b800eb447952106fff096bc56274b':

commit 47c8359abba486d4c842fd8972dc8233c8cc497d
Merge: 8207b3a 3fea2f1
Author: Mark Wei <markwei@google.com>
Date:   Wed Nov 7 11:02:59 2012 -0800

    am 3fea2f1a: am acd8e786: Revert "Enable Email lockscreen widget" https://b.corp.google.com/issue?id=7488437#ISSUE_HistoryHeader13

    * commit '3fea2f1a07680dcdd6da5e09ab6f0138e5561693':
      Revert "Enable Email lockscreen widget" https://b.corp.google.com/issue?id=7488437#ISSUE_HistoryHeader13

commit 8207b3a10f071384c37cfe40f4bf730748662648
Merge: 29b0c4e 2159898
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Nov 7 10:24:21 2012 -0800

    am 2159898a: Reconcile with jb-mr1-release - do not merge

    * commit '2159898ac557b3071379e9d11545aa990c207a45':

commit a792d3d4d1569eb6a1d606a13c6219ebe5d78bfd
Merge: 8654d8c 8449937
Author: The Android Automerger <android-build@android.com>
Date:   Wed Nov 7 07:50:38 2012 -0800

    merge in master-release history after reset to master

commit 29b0c4e5f71ad661e232a34b070766ceef5126fd
Merge: 192690b cb80029
Author: Mark Wei <markwei@google.com>
Date:   Tue Nov 6 16:38:08 2012 -0800

    am cb800298: am 8c7f8d74: Enable Email lockscreen widget

    * commit 'cb800298379cf63b537584886cb1b4078e450035':
      Enable Email lockscreen widget

commit 8654d8c1cb8099f8d02cd025a979596ede1d3970
Merge: 98d595d eec4156
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Nov 6 14:45:04 2012 -0800

    Merge "Import translations. DO NOT MERGE"

commit eec4156c43e5bd495fd47f41bb847aa859ad52d8
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Nov 6 12:45:13 2012 -0800

    Import translations. DO NOT MERGE

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

commit 98d595dcca1b10f9fd1bfe7886461c61cdbba0fe
Merge: e925667 b94fb3a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:40:15 2012 -0800

    am b94fb3a1: (-s ours) Reconcile with jb-mr1.1-release - do not merge

    * commit 'b94fb3a1d7949df8da2c9e3d878548590c881b1d':

commit b94fb3a1d7949df8da2c9e3d878548590c881b1d
Merge: ee85a21 d252350
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:37:46 2012 -0800

    Reconcile with jb-mr1.1-release - do not merge

    Change-Id: I8e4666520f0e7c218e29fccd82e1dd6852752dbd

commit e925667a80d1e9255e267b8de865f453909f551e
Merge: 012f63b ee85a21
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:34:07 2012 -0800

    am ee85a21e: (-s ours) am 192690b8: am 992df2fa: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit 'ee85a21e5426ce0bacb3eac92f8656ce2f97907e':

commit 012f63b217a908b3963fad8064f6aa60504c67d6
Merge: 2d3f4ad 1ca4061
Author: Mark Wei <markwei@google.com>
Date:   Tue Nov 6 12:34:05 2012 -0800

    am 1ca4061c: am 06c376ed: am f7610ff7: Show newer/older text in toast upon long-press

    * commit '1ca4061cd7ff214e5c8933e880290c53c70dd389':
      Show newer/older text in toast upon long-press

commit 2d3f4ada5570fdb8e4526605736c87d2fd4ccb31
Merge: ed1eeae 7e2a8e2
Author: Mark Wei <markwei@google.com>
Date:   Tue Nov 6 12:34:04 2012 -0800

    am 7e2a8e2a: am b09c5f88: am 1171c5ef: Show newer/older text in toast upon long-press

    * commit '7e2a8e2aebd41600a20106538fd1bdc84cc96d48':
      Show newer/older text in toast upon long-press

commit ee85a21e5426ce0bacb3eac92f8656ce2f97907e
Merge: 1ca4061 192690b
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:30:05 2012 -0800

    am 192690b8: am 992df2fa: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit '192690b863a912fb1c1e7a7620ad6915933f9662':

commit 1ca4061cd7ff214e5c8933e880290c53c70dd389
Merge: 7e2a8e2 06c376e
Author: Mark Wei <markwei@google.com>
Date:   Tue Nov 6 12:30:04 2012 -0800

    am 06c376ed: am f7610ff7: Show newer/older text in toast upon long-press

    * commit '06c376edb0ee3194dbbfee1286bca92da9ca9815':
      Show newer/older text in toast upon long-press

commit 7e2a8e2aebd41600a20106538fd1bdc84cc96d48
Merge: 3232aaa b09c5f8
Author: Mark Wei <markwei@google.com>
Date:   Tue Nov 6 12:30:02 2012 -0800

    am b09c5f88: am 1171c5ef: Show newer/older text in toast upon long-press

    * commit 'b09c5f889e0af2785728a7d9e8fc147ba2dbdb89':
      Show newer/older text in toast upon long-press

commit 192690b863a912fb1c1e7a7620ad6915933f9662
Merge: 06c376e 992df2f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:24:04 2012 -0800

    am 992df2fa: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit '992df2fa1f649ae0ce11260325c310c247798da5':
      Always call setActivePolicies() when creating SecurityPolicy
      Force user to accept new policies
      DPM doesn't support hasGrantedPolicy to keyguard widgets
      Don't smartsend reply inappropriately
      Use correct test for updating attachment contentUri
      Handle non-ascii folder names properly
      Fix handling of header data
      Catch exception in monkey runs
      POP3 renovation
      Import translations. DO NOT MERGE
      Import translations. DO NOT MERGE

commit 06c376edb0ee3194dbbfee1286bca92da9ca9815
Merge: b09c5f8 f7610ff
Author: Mark Wei <markwei@google.com>
Date:   Tue Nov 6 12:24:03 2012 -0800

    am f7610ff7: Show newer/older text in toast upon long-press

    * commit 'f7610ff77fb61d8323ff36a4f2484a47d7cd2d2b':
      Show newer/older text in toast upon long-press

commit b09c5f889e0af2785728a7d9e8fc147ba2dbdb89
Merge: 4d484ec 1171c5e
Author: Mark Wei <markwei@google.com>
Date:   Tue Nov 6 12:24:02 2012 -0800

    am 1171c5ef: Show newer/older text in toast upon long-press

    * commit '1171c5efd50e5c11da6712f221782c101d4258c1':
      Show newer/older text in toast upon long-press

commit ed1eeaec9f2ce0177d592c92eb486873d52a418a
Merge: e6f454a 3232aaa
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 31 09:22:39 2012 -0700

    am 3232aaa3: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit '3232aaa3ba7b1f6c2196fd9ac2493689c6885645':

commit 3232aaa3ba7b1f6c2196fd9ac2493689c6885645
Merge: 3a82cd0 969bf2b ce9fadc
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 31 09:18:03 2012 -0700

    Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    Change-Id: Ic39968db1acd586856f7e8824a2e40b70339582e

commit 8449937eb7cb23cc435cd177fe378bed47b9eab9
Merge: e6f454a e270d2f
Author: The Android Automerger <android-build@android.com>
Date:   Thu Oct 25 07:58:21 2012 -0700

    merge in master-release history after reset to master

commit e6f454ac43764a6796748069d48fcbaae04051d4
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Oct 24 09:20:53 2012 -0700

    Import translations. DO NOT MERGE

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

commit a399ba7c35b701febfac4a3447767d0b416af20c
Merge: 9580dcd 3a82cd0
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Oct 22 11:24:19 2012 -0700

    am 3a82cd0a: am 4d484ecb: am 7e0009b5: Simple fix for 7381557

    * commit '3a82cd0abbc8c0b1c0b0ca3fcc645446ed537d15':
      Simple fix for 7381557

commit 3a82cd0abbc8c0b1c0b0ca3fcc645446ed537d15
Merge: 9604328 4d484ec
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Oct 22 11:21:06 2012 -0700

    am 4d484ecb: am 7e0009b5: Simple fix for 7381557

    * commit '4d484ecba28a84afce28e622cd2034d5bd49ba3f':
      Simple fix for 7381557

commit 4d484ecba28a84afce28e622cd2034d5bd49ba3f
Merge: 23d156c 7e0009b
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Oct 22 11:19:38 2012 -0700

    am 7e0009b5: Simple fix for 7381557

    * commit '7e0009b5ac23c37c9fc6142c218d9f4c66e8f400':
      Simple fix for 7381557

commit 9580dcdafa561cd222586cb7579ca4d8522eb83a
Merge: d410616 9604328
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Oct 16 20:49:55 2012 -0700

    am 96043281: (-s ours) am 23d156c9: am d5c0a0ee: Import translations. DO NOT MERGE

    * commit '960432810f290052ea74acbab976d220ef04ab72':
      Import translations. DO NOT MERGE

commit 960432810f290052ea74acbab976d220ef04ab72
Merge: 682897e 23d156c
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Oct 16 20:47:44 2012 -0700

    am 23d156c9: am d5c0a0ee: Import translations. DO NOT MERGE

    * commit '23d156c9b8ecd357b685ac69cf4447eedd02360d':
      Import translations. DO NOT MERGE

commit d41061684577739b0da2c072c1d58ae8dfd39a14
Merge: 38cbcc6 682897e
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Oct 16 20:47:27 2012 -0700

    am 682897ec: (-s ours) am db7cd540: Import translations. DO NOT MERGE

    * commit '682897ec788b1f5390c95a78658f2aa3be2fb86b':
      Import translations. DO NOT MERGE

commit 23d156c9b8ecd357b685ac69cf4447eedd02360d
Merge: db7cd54 d5c0a0e
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Oct 16 20:45:34 2012 -0700

    am d5c0a0ee: Import translations. DO NOT MERGE

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

commit 682897ec788b1f5390c95a78658f2aa3be2fb86b
Merge: a085ffe db7cd54
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Oct 16 20:45:12 2012 -0700

    am db7cd540: Import translations. DO NOT MERGE

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

commit 38cbcc62a418fafb9853d9db219cc913fb78c008
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Oct 16 12:34:18 2012 -0700

    Import translations. DO NOT MERGE

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

commit db7cd540f1c351439e159827b89c5eb99ec78077
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Oct 16 12:30:30 2012 -0700

    Import translations. DO NOT MERGE

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

commit c7b24d2a5de5bd51113bca3c9b3d6d3904e176da
Merge: d68eb62 a085ffe
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Oct 15 07:43:13 2012 -0700

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

    * commit 'a085ffe642b375802e332d4da90056c31f00964c':

commit a085ffe642b375802e332d4da90056c31f00964c
Merge: d2f0033 588b4d8
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Oct 15 07:39:57 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I328eddb08ed54b86c23c119e5af4e659ba4b0064

commit d68eb62338021f84f4e796b4c6a4e0e5a2539cdd
Merge: 378d9cc d2f0033
Author: Jason Chen <jasonchen@google.com>
Date:   Sun Oct 14 23:11:12 2012 -0700

    am d2f00339: am de2d82c9: am c99bf32e: Let\'s enhance

    * commit 'd2f003397b8cadb2e21eb23b65f9d44c0b549680':
      Let's enhance

commit d2f003397b8cadb2e21eb23b65f9d44c0b549680
Merge: e30a8fc de2d82c
Author: Jason Chen <jasonchen@google.com>
Date:   Sun Oct 14 23:08:05 2012 -0700

    am de2d82c9: am c99bf32e: Let\'s enhance

    * commit 'de2d82c9f0557dc3d1638ccdf3fe5be92ecd6d38':
      Let's enhance

commit de2d82c9f0557dc3d1638ccdf3fe5be92ecd6d38
Merge: fcde992 c99bf32
Author: Jason Chen <jasonchen@google.com>
Date:   Sun Oct 14 23:04:44 2012 -0700

    am c99bf32e: Let\'s enhance

    * commit 'c99bf32ecba4ee5e8c7082d4b11ed0d5bbc133c7':
      Let's enhance

commit 378d9ccd60fe3ca29c08b090f61e06cc0c79b10a
Merge: 9cfd5fa e30a8fc
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 9 07:35:43 2012 -0700

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

    * commit 'e30a8fceb8d58b424a8b20f0ea4fe095d4e0098a':

commit e30a8fceb8d58b424a8b20f0ea4fe095d4e0098a
Merge: 6af5004 5c7e083
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 9 07:30:11 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I477669ecd2abdcc36ccb13ee08731b0292b90914

commit 9cfd5fa5005b5a42dec0792bbf3b2b35f3e06f0e
Merge: d0219d8 6af5004
Author: Paul Westbrook <pwestbro@google.com>
Date:   Sun Oct 7 14:05:24 2012 -0700

    am 6af50043: am fcde9924: am 2cc86bc0: Revert the Email lockscreen widget

    * commit '6af5004387c457d6136ffd75a871e2ec4a17d4ed':
      Revert the Email lockscreen widget

commit 6af5004387c457d6136ffd75a871e2ec4a17d4ed
Merge: e7c3114 fcde992
Author: Paul Westbrook <pwestbro@google.com>
Date:   Sun Oct 7 14:03:05 2012 -0700

    am fcde9924: am 2cc86bc0: Revert the Email lockscreen widget

    * commit 'fcde9924836af57cbf943091cdc90d2001a2aedf':
      Revert the Email lockscreen widget

commit fcde9924836af57cbf943091cdc90d2001a2aedf
Merge: 4f08c86 2cc86bc
Author: Paul Westbrook <pwestbro@google.com>
Date:   Sun Oct 7 14:01:06 2012 -0700

    am 2cc86bc0: Revert the Email lockscreen widget

    * commit '2cc86bc0f52c9192ef5626762a104cbedb413dd2':
      Revert the Email lockscreen widget

commit d0219d8ea2d09bb6bccc3f3f95c197e3e12f8968
Merge: 9477116 e7c3114
Author: Mark Wei <markwei@google.com>
Date:   Fri Oct 5 14:59:51 2012 -0700

    am e7c31145: am 4f08c866: am 3e04e18f: Make Email widget available on lock screen

    * commit 'e7c31145ee732ed8a8eeb34866e398b27957d907':
      Make Email widget available on lock screen

commit e7c31145ee732ed8a8eeb34866e398b27957d907
Merge: 2d90032 4f08c86
Author: Mark Wei <markwei@google.com>
Date:   Fri Oct 5 14:58:13 2012 -0700

    am 4f08c866: am 3e04e18f: Make Email widget available on lock screen

    * commit '4f08c866122c66933be09441ce12c8dda044ca2a':
      Make Email widget available on lock screen

commit 4f08c866122c66933be09441ce12c8dda044ca2a
Merge: cdb138f 3e04e18
Author: Mark Wei <markwei@google.com>
Date:   Fri Oct 5 14:56:28 2012 -0700

    am 3e04e18f: Make Email widget available on lock screen

    * commit '3e04e18f028a47900b86034e5513e76506a2bb87':
      Make Email widget available on lock screen

commit 947711699081b7d67ccfa3fea1de40c694958bc1
Merge: da38515 2d90032
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Oct 5 08:20:38 2012 -0700

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

    * commit '2d90032a5866a3d38d89b69751b5c3ea6a0b2183':
      Always call setActivePolicies() when creating SecurityPolicy
      Force user to accept new policies

commit 2d90032a5866a3d38d89b69751b5c3ea6a0b2183
Merge: 96dd66c cb90e5c
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Oct 5 08:17:34 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I0c6d66fc91f1552bcbb9c0b15697cfd01511e188

commit da38515f475cd622b7700b52b8ee7ab27d4eca23
Merge: 4fd484f 96dd66c
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Oct 4 21:09:35 2012 -0700

    am 96dd66ca: (-s ours) am cdb138f8: am 968a3570: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '96dd66ca6ec6805d1cb5d0c3d1c0a4ff8a01c342':
      Import translations. DO NOT MERGE

commit 96dd66ca6ec6805d1cb5d0c3d1c0a4ff8a01c342
Merge: 1f450d1 cdb138f
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Oct 4 21:07:16 2012 -0700

    am cdb138f8: am 968a3570: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

commit 4fd484fe5ee782fa64ba28ac9bc4679eebff6d73
Merge: 0d542c3 1f450d1
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Oct 4 21:06:33 2012 -0700

    am 1f450d14: (-s ours) am 8c99b1d7: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

    * commit '1f450d149e63ebc79923ae2b41d3a437772c9d07':
      Import translations. DO NOT MERGE

commit cdb138f8392ac44051bb3fe0c6eed9162a8f1369
Merge: 8c99b1d 968a357
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Oct 4 21:05:25 2012 -0700

    am 968a3570: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '968a3570548b81b6cb20f9ea5b6b4af3fe68ccd1':
      Import translations. DO NOT MERGE

commit 0d542c3891ea4f331336f374a34f1c305b43b668
Merge: 7fc9b12 15da711
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Oct 4 21:04:42 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit 1f450d149e63ebc79923ae2b41d3a437772c9d07
Merge: cee34f0 8c99b1d
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Oct 4 21:04:19 2012 -0700

    am 8c99b1d7: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

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

commit 8c99b1d7167e0886e63e830dd49605de635250b7
Merge: b86a26f e4a9a63
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Oct 4 21:03:17 2012 -0700

    Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

commit 7fc9b12a8208ce2bad40b8a807ba8a1cff7a6fff
Merge: 3b9892d cee34f0
Author: Marc Blank <mblank@google.com>
Date:   Thu Oct 4 14:55:30 2012 -0700

    am cee34f00: am b86a26f5: am e1c41f84: Merge "Force user to accept new policies" into jb-mr1-dev

    * commit 'cee34f00277dd0d0b00da1999599ef4b6153ec29':
      Force user to accept new policies

commit cee34f00277dd0d0b00da1999599ef4b6153ec29
Merge: 2243cc4 b86a26f
Author: Marc Blank <mblank@google.com>
Date:   Thu Oct 4 14:53:29 2012 -0700

    am b86a26f5: am e1c41f84: Merge "Force user to accept new policies" into jb-mr1-dev

    * commit 'b86a26f558cb134cf3d48072a653ae6bd52a9587':
      Force user to accept new policies

commit b86a26f558cb134cf3d48072a653ae6bd52a9587
Merge: 578b4f0 e1c41f8
Author: Marc Blank <mblank@google.com>
Date:   Thu Oct 4 14:51:09 2012 -0700

    am e1c41f84: Merge "Force user to accept new policies" into jb-mr1-dev

    * commit 'e1c41f849c60731432f08332a9bd279bc94735f5':
      Force user to accept new policies

commit 15da711ece0ec5b630f087bfce9a4a2d2c861857
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Oct 4 12:08:29 2012 -0700

    Import translations. DO NOT MERGE

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

commit e4a9a6301fdc1bb8723c93ee842c1d5ab7c3156e
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Oct 4 12:04:04 2012 -0700

    Import translations. DO NOT MERGE

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

commit 3b9892d2545a20196f2f24339b5aa4dca120321d
Merge: efc64b8 2243cc4
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Oct 4 07:52:28 2012 -0700

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

    * commit '2243cc478398a792616876c424c7909926d19434':
      DPM doesn't support hasGrantedPolicy to keyguard widgets

commit 2243cc478398a792616876c424c7909926d19434
Merge: bed929a acdb953
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Oct 4 07:49:25 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I9ed2302f1dda1afd2c3ff546a375cf680b9b48b5

commit efc64b8cd29d55ee1d2c5087ce5e5dbe1650f79c
Merge: 402a6e5 bed929a
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Oct 3 22:07:13 2012 -0700

    am bed929ae: (-s ours) am 578b4f0a: am e530158c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

commit bed929ae22856adc7ed06e7d62d7881bb51a4fed
Merge: a8982b3 578b4f0
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Oct 3 22:06:08 2012 -0700

    am 578b4f0a: am e530158c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '578b4f0a990b7d214e8cef00fe8cf5eb8bb53b06':
      Import translations. DO NOT MERGE

commit 402a6e5de7c98566161ce2745381e766b7492380
Merge: df03d74 a8982b3
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Oct 3 22:05:45 2012 -0700

    am a8982b3d: (-s ours) am 30bd1c3e: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

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

commit df03d74aa8fb1830c32d4d7c07408e061affc2fa
Merge: 4254b3a 253155a
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Oct 3 22:05:05 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit a8982b3d49dca8d42b32f8071f3bd67fe271c9a1
Merge: cbaea28 30bd1c3
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Oct 3 22:03:34 2012 -0700

    am 30bd1c3e: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

    * commit '30bd1c3ece989494af127c32197bd9d4279bea78':
      Import translations. DO NOT MERGE

commit 578b4f0a990b7d214e8cef00fe8cf5eb8bb53b06
Merge: 30bd1c3 e530158
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Oct 3 22:03:31 2012 -0700

    am e530158c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

commit 30bd1c3ece989494af127c32197bd9d4279bea78
Merge: efb57e9 44ff834
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Oct 3 22:01:41 2012 -0700

    Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

commit 253155aef9a3e2d3683329666c613d64b5ffee4b
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Oct 3 17:54:08 2012 -0700

    Import translations. DO NOT MERGE

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

commit 44ff8349346146328187022031684e46d5b67716
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Oct 3 17:50:42 2012 -0700

    Import translations. DO NOT MERGE

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

commit 4254b3ab77e909ec1cbce3e17485f29be633be7a
Merge: fabfefa cbaea28
Author: Marc Blank <mblank@google.com>
Date:   Wed Oct 3 17:31:30 2012 -0700

    am cbaea281: am efb57e98: am 8e4fac46: Always call setActivePolicies() when creating SecurityPolicy

    * commit 'cbaea2810be7b18f4c07480571381ae0389524dc':
      Always call setActivePolicies() when creating SecurityPolicy

commit cbaea2810be7b18f4c07480571381ae0389524dc
Merge: 39b9249 efb57e9
Author: Marc Blank <mblank@google.com>
Date:   Wed Oct 3 17:30:09 2012 -0700

    am efb57e98: am 8e4fac46: Always call setActivePolicies() when creating SecurityPolicy

    * commit 'efb57e98d8e390fddc4c8f7c3ca869dc4c2d21bc':
      Always call setActivePolicies() when creating SecurityPolicy

commit efb57e98d8e390fddc4c8f7c3ca869dc4c2d21bc
Merge: 3de35c3 8e4fac4
Author: Marc Blank <mblank@google.com>
Date:   Wed Oct 3 17:29:15 2012 -0700

    am 8e4fac46: Always call setActivePolicies() when creating SecurityPolicy

    * commit '8e4fac46e148a712c8dab625c72f3294fb1749fc':
      Always call setActivePolicies() when creating SecurityPolicy

commit fabfefab3a7f1ebb90e352c16f67d290d2416622
Merge: a7ee8b1 39b9249
Author: Marc Blank <mblank@google.com>
Date:   Wed Oct 3 10:58:48 2012 -0700

    am 39b92498: am 3de35c38: am 98291458: DPM doesn\'t support hasGrantedPolicy to keyguard widgets

    * commit '39b924984e93120c8a24e4ec9f21993d95715260':
      DPM doesn't support hasGrantedPolicy to keyguard widgets

commit 39b924984e93120c8a24e4ec9f21993d95715260
Merge: b8a3d5d 3de35c3
Author: Marc Blank <mblank@google.com>
Date:   Wed Oct 3 10:56:21 2012 -0700

    am 3de35c38: am 98291458: DPM doesn\'t support hasGrantedPolicy to keyguard widgets

    * commit '3de35c38f9830062f4f14a5a90a729ef607cefb3':
      DPM doesn't support hasGrantedPolicy to keyguard widgets

commit 3de35c38f9830062f4f14a5a90a729ef607cefb3
Merge: ecfc44f 9829145
Author: Marc Blank <mblank@google.com>
Date:   Wed Oct 3 10:53:48 2012 -0700

    am 98291458: DPM doesn\'t support hasGrantedPolicy to keyguard widgets

    * commit '98291458573fe5fc5abea1833e34c6c179d250f4':
      DPM doesn't support hasGrantedPolicy to keyguard widgets

commit a7ee8b106879ae01d554a6a19ad639814d594cde
Merge: dca9639 b8a3d5d
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 3 07:36:36 2012 -0700

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

    * commit 'b8a3d5da0eedb7d88fc266b1b96598026df45326':

commit b8a3d5da0eedb7d88fc266b1b96598026df45326
Merge: 9220cd6 2376c5e
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 3 07:34:49 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Iec1e9f587a29e1f68402a4ee048185b56d0ed539

commit dca9639842872e5d9a4b05bcfaca69935bb061d1
Merge: aba8215 9220cd6
Author: Marc Blank <mblank@google.com>
Date:   Tue Oct 2 19:39:05 2012 -0700

    am 9220cd61: am ecfc44fb: am 5ef68c20: Disable keyguard features if we\'re enabled and require password

    * commit '9220cd616d38d4948341c4b53bbd33a3875eb507':
      Disable keyguard features if we're enabled and require password

commit 9220cd616d38d4948341c4b53bbd33a3875eb507
Merge: 6082533 ecfc44f
Author: Marc Blank <mblank@google.com>
Date:   Tue Oct 2 19:37:30 2012 -0700

    am ecfc44fb: am 5ef68c20: Disable keyguard features if we\'re enabled and require password

    * commit 'ecfc44fb33af06f004b0835932938e9a3b09bb67':
      Disable keyguard features if we're enabled and require password

commit ecfc44fb33af06f004b0835932938e9a3b09bb67
Merge: be4c6c4 5ef68c2
Author: Marc Blank <mblank@google.com>
Date:   Tue Oct 2 19:35:01 2012 -0700

    am 5ef68c20: Disable keyguard features if we\'re enabled and require password

    * commit '5ef68c20bdd60d4813f307b4516ae68b1d05a248':
      Disable keyguard features if we're enabled and require password

commit aba821576746cc570288cd7df709f9e37f62c88e
Merge: 6d0b202 6082533
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 2 09:24:34 2012 -0700

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

    * commit '6082533b3bb32d78671532802feb30eca16dc608':

commit 6082533b3bb32d78671532802feb30eca16dc608
Merge: a20cac1 f73c33d
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 2 09:19:39 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I522578d87f516d9b92b1f56074f051c8d0041257

commit 6d0b2029b05dba6302cbbdc63700742ee67d9e26
Merge: e80e7cc a20cac1
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 28 13:47:04 2012 -0700

    am a20cac12: Merge from jb-mr1-aah-dev

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

commit a20cac126da042401f55d169c8644ab6af3c0233
Merge: 154e9d2 be4c6c4
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 28 13:44:24 2012 -0700

    Merge from jb-mr1-aah-dev

    Change-Id: I8a893b475fad5349b6d1460c5d913a3b01c1fb53

commit e80e7cc84210b09c8385358e79558d701026564d
Merge: 363a5e1 154e9d2
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 28 10:24:58 2012 -0700

    am 154e9d21: (-s ours) am 88608cfb: Import translations. DO NOT MERGE

    * commit '154e9d21796af7e924d9b15958935476a70940f5':
      Import translations. DO NOT MERGE

commit 154e9d21796af7e924d9b15958935476a70940f5
Merge: ef357ad 88608cf
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 28 10:22:34 2012 -0700

    am 88608cfb: Import translations. DO NOT MERGE

    * commit '88608cfba6b281b3c2428b72805e4eb283d330e9':
      Import translations. DO NOT MERGE

commit be4c6c4a62faafe0b6445992c585e1ae523a95b9
Merge: fe42641 88608cf
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 28 10:21:52 2012 -0700

    am 88608cfb: (-s ours) Import translations. DO NOT MERGE

    * commit '88608cfba6b281b3c2428b72805e4eb283d330e9':
      Import translations. DO NOT MERGE

commit 363a5e11450fc98bba0da0e8a8ed5f53f8492789
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 28 09:57:14 2012 -0700

    Import translations. DO NOT MERGE

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

commit fe4264157b84f6bcbcde8583899ddb807a15ae7e
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 28 09:53:39 2012 -0700

    Import translations. DO NOT MERGE

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

commit cf425d70aa531af38e6243875893ae87db011c7a
Merge: c10e7d5 ef357ad
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 28 00:37:24 2012 -0700

    am ef357adb: (-s ours) am b2af6cc7: Import translations. DO NOT MERGE

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

commit c10e7d5113d27e668665300bb22afd0e5c8bb44f
Merge: 7b35998 6bf5999
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Sep 28 00:32:39 2012 -0700

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

    * commit '6bf5999616df986d1e126bddf47126099ed858de':

commit 97c7b13fccce7347444979e8318f5a6230524bcc
Merge: 0646bc0 b2af6cc
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 27 21:31:10 2012 -0700

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

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

commit ef357adb2209901ed42d156e713c5575e969a5bf
Merge: 6bf5999 b2af6cc
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 27 21:31:03 2012 -0700

    am b2af6cc7: Import translations. DO NOT MERGE

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

commit 7b359986daa57cf3536731fb059afc02a38edc91
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 27 21:23:03 2012 -0700

    Import translations. DO NOT MERGE

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

commit 0646bc0d872e344c113b865e9b91d164b8c22205
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 27 21:19:37 2012 -0700

    Import translations. DO NOT MERGE

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

commit 0fda3249bd8914368b50a5b468d7088b9ec5cc2a
Merge: 947f22e 524c27f
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 27 16:12:35 2012 -0700

    am 524c27f7: (-s ours) am 6833295a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '524c27f77de3c158d251efbc491f2039115ef41d':
      Import translations. DO NOT MERGE

commit 6bf5999616df986d1e126bddf47126099ed858de
Merge: 524c27f 1868dd0
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 27 09:58:49 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I5b478c3b233bb88cac8bd3c35b5be6f959766a9f

commit 799bbe99ba0b27111658dccea36225e19d36a98e
Merge: 9e09cba 6833295
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 27 09:22:36 2012 -0700

    am 6833295a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '6833295af8e20fc301f481d80f6fefc2ced4456a':
      Import translations. DO NOT MERGE

commit 524c27f77de3c158d251efbc491f2039115ef41d
Merge: 4659f11 6833295
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 27 09:22:29 2012 -0700

    am 6833295a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '6833295af8e20fc301f481d80f6fefc2ced4456a':
      Import translations. DO NOT MERGE

commit 9e09cbaeea905e0916e9592259485a515ee619f5
Merge: eeb8622 189e886
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 27 09:21:09 2012 -0700

    Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

commit 947f22e10bea5ca1ad259d58d24ac6b17d679120
Merge: 0e1ca71 dca6dbf
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 27 09:19:30 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit 0e1ca71bdddf5dc9a4c3d4a5058001ba5b67d7a7
Merge: ec5272e 4659f11
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Wed Sep 26 18:35:34 2012 -0700

    am 4659f111: am 0678bf5c: Fix build breakage.

    * commit '4659f11173460ef68d6ee5a7eeae9e7e6f051650':
      Fix build breakage.

commit 4659f11173460ef68d6ee5a7eeae9e7e6f051650
Merge: ded77c2 0678bf5
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Wed Sep 26 18:34:02 2012 -0700

    am 0678bf5c: Fix build breakage.

    * commit '0678bf5ccc461782582d01ab58d35a96fd859bd5':
      Fix build breakage.

commit eeb8622cd3f164f44b5ce1cc401a4dd4bd4d63fd
Merge: 79a1c25 0678bf5
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Wed Sep 26 18:33:21 2012 -0700

    am 0678bf5c: Fix build breakage.

    * commit '0678bf5ccc461782582d01ab58d35a96fd859bd5':
      Fix build breakage.

commit dca6dbf2b522b3e6420c65e672a91d9577fbd498
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Sep 26 15:18:15 2012 -0700

    Import translations. DO NOT MERGE

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

commit 189e886bd39edff4fb35b1e0d388e1163180e4ad
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Sep 26 15:14:49 2012 -0700

    Import translations. DO NOT MERGE

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

commit ec5272eb91b63e711d7d4d851dd39bc38dbad525
Merge: e2b2604 ded77c2
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 26 10:08:00 2012 -0700

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

    * commit 'ded77c2348b81b0a8ea97c94b144e4cd8cd55b41':

commit ded77c2348b81b0a8ea97c94b144e4cd8cd55b41
Merge: 52a398b 18288d4
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 26 09:07:55 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Iba83f49a04a7645eabda2adc9406a470169eaba6

commit e2b260475905c9af64c36380f8c87466c2db2355
Merge: 61b42d4 52a398b
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Sep 25 15:34:08 2012 -0700

    am 52a398ba: (-s ours) am 8cdece25: Import translations. DO NOT MERGE

    * commit '52a398baaadca6a940ae69564d922edfa5dc164a':
      Import translations. DO NOT MERGE

commit 79a1c250b60fade01e98e36364e2f7a2c329a4e5
Merge: 7ff6537 8cdece2
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Sep 25 14:19:19 2012 -0700

    am 8cdece25: (-s ours) Import translations. DO NOT MERGE

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

commit 52a398baaadca6a940ae69564d922edfa5dc164a
Merge: b88b0d8 8cdece2
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Sep 25 14:18:51 2012 -0700

    am 8cdece25: Import translations. DO NOT MERGE

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

commit 61b42d414c5a817469afa158291813536530ce85
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Sep 25 12:18:28 2012 -0700

    Import translations. DO NOT MERGE

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

commit 7ff6537cf3b2d768eab3fe62b8e92b65dfaaf70c
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Sep 25 12:14:55 2012 -0700

    Import translations. DO NOT MERGE

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

commit 797c3496c9361ce02684aec394e50dd0c9c564c3
Merge: b146414 b88b0d8
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Sep 24 23:03:39 2012 -0700

    resolved conflicts for merge of b88b0d85 to master

    Change-Id: Id4d70d1aec68630f3f0cda186658773bff090733

commit f0aa889da57f309007a9a9ac8d5250c043e2bef8
Merge: d2e1d80 bc47398
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Sep 24 22:24:00 2012 -0700

    am bc473981: Merge Email1 into MR1

    * commit 'bc47398187c6ffd132435e51d8d61e6ec79a79db':
      Merge Email1 into MR1

commit b88b0d857fadc106fe6a61fd75900521bbb5c3fb
Merge: 226f1e9 bc47398
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Sep 24 22:23:56 2012 -0700

    am bc473981: Merge Email1 into MR1

    * commit 'bc47398187c6ffd132435e51d8d61e6ec79a79db':
      Merge Email1 into MR1

commit b146414fb0e03ab15fb991ab0467c7dbb2de3386
Merge: eee05b7 226f1e9
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Sep 24 10:15:06 2012 -0700

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

    * commit '226f1e97fdd6148d310f05cc2ebe2d997fc642a0':

commit 226f1e97fdd6148d310f05cc2ebe2d997fc642a0
Merge: bfc5de9 bcf622f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Sep 24 10:13:04 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I93c043b4c56592b38c19b8b32349bf8bd9d9aac2

commit eee05b7c30e2435deee81aee09b863ed3768633e
Merge: 8f49741 bfc5de9
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Sep 24 09:40:08 2012 -0700

    am bfc5de9b: am 335ba2c4: am 986881ef: Fix multi message notifications

    * commit 'bfc5de9b1fdbe48abb825bcf8968551b6068072b':
      Fix multi message notifications

commit 8f49741b17b3d4470c9bda32c57e5e43f291cac4
Merge: 4d71bfb 9461858
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 24 09:40:06 2012 -0700

    am 9461858f: am ee6ca4e7: am 35177585: Merge "Remove Imap2 from AOSP tree" into jb-ub-mail

    * commit '9461858f2c782db90af6ade73f6838bc1ba6c4be':
      Remove Imap2 from AOSP tree

commit 4d71bfb1d5e94fedbe5519dac120efd4c308653d
Merge: f614356 e301ea6
Author: Vikram Aggarwal <viki@google.com>
Date:   Mon Sep 24 09:40:04 2012 -0700

    am e301ea65: am 24e11036: am 016310a0: Fix account order.

    * commit 'e301ea65653f851335c1d01893f129b50154c99b':
      Fix account order.

commit f61435626630a1052b3748aa48e3026226d33297
Merge: 3176c31 ef588ed
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 24 09:40:03 2012 -0700

    am ef588ed3: am d47027b9: am 114e3149: Return contentUri for all attachments

    * commit 'ef588ed3ada6ee386b63a8cec476ffe07e0dd16e':
      Return contentUri for all attachments

commit 3176c310593d6458dba76c08a2c8528ffeaa58c1
Merge: 573f2e4 f50a229
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 24 09:40:01 2012 -0700

    am f50a2293: am bb34ef2d: am 54347010: Allow legacy imap to sync

    * commit 'f50a2293911de987008e8665d1340ba7c772c87b':
      Allow legacy imap to sync

commit 573f2e4dcc9753991c514a9b1acc5cf0cf63fa45
Merge: f5f3eed 657ff12
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 24 09:39:59 2012 -0700

    am 657ff124: am 2bbb9375: am 9f05983f: Merge "Prevent duplicate imap folders" into jb-ub-mail

    * commit '657ff1241d689792ab5961e66f4590353a1bbcf2':
      Prevent duplicate imap folders

commit bfc5de9b1fdbe48abb825bcf8968551b6068072b
Merge: 9461858 335ba2c
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Sep 24 09:29:58 2012 -0700

    am 335ba2c4: am 986881ef: Fix multi message notifications

    * commit '335ba2c4ea9c93e8c59f8a2641b1bff149026ce4':
      Fix multi message notifications

commit 9461858f2c782db90af6ade73f6838bc1ba6c4be
Merge: e301ea6 ee6ca4e
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 24 09:29:57 2012 -0700

    am ee6ca4e7: am 35177585: Merge "Remove Imap2 from AOSP tree" into jb-ub-mail

    * commit 'ee6ca4e7b28d496bdd738422df9729235e28c888':
      Remove Imap2 from AOSP tree

commit e301ea65653f851335c1d01893f129b50154c99b
Merge: ef588ed 24e1103
Author: Vikram Aggarwal <viki@google.com>
Date:   Mon Sep 24 09:29:55 2012 -0700

    am 24e11036: am 016310a0: Fix account order.

    * commit '24e11036e76f735accb9bf812d2a657dce8f5c07':
      Fix account order.

commit ef588ed3ada6ee386b63a8cec476ffe07e0dd16e
Merge: f50a229 d47027b
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 24 09:29:54 2012 -0700

    am d47027b9: am 114e3149: Return contentUri for all attachments

    * commit 'd47027b92d07342223b6094748787414ce22e549':
      Return contentUri for all attachments

commit f50a2293911de987008e8665d1340ba7c772c87b
Merge: 657ff12 bb34ef2
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 24 09:29:53 2012 -0700

    am bb34ef2d: am 54347010: Allow legacy imap to sync

    * commit 'bb34ef2d966590994ae424dbbaf626b0fd733aef':
      Allow legacy imap to sync

commit 657ff1241d689792ab5961e66f4590353a1bbcf2
Merge: 4384596 2bbb937
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 24 09:29:51 2012 -0700

    am 2bbb9375: am 9f05983f: Merge "Prevent duplicate imap folders" into jb-ub-mail

    * commit '2bbb93750f02d0b3ac534b03d4279c82ef28a3a7':
      Prevent duplicate imap folders

commit d2e1d80749763eb7d84e0d30112e6bc0b26cf270
Merge: 438b469 335ba2c
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Sep 24 08:51:45 2012 -0700

    am 335ba2c4: am 986881ef: Fix multi message notifications

    * commit '335ba2c4ea9c93e8c59f8a2641b1bff149026ce4':
      Fix multi message notifications

commit 438b469a2f221b9714ba3794956858ee5a3cd169
Merge: dd02f8f ee6ca4e
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 24 08:51:44 2012 -0700

    am ee6ca4e7: am 35177585: Merge "Remove Imap2 from AOSP tree" into jb-ub-mail

    * commit 'ee6ca4e7b28d496bdd738422df9729235e28c888':
      Remove Imap2 from AOSP tree

commit dd02f8f862e1b41f19f1b74be181b1dccdfb36fe
Merge: dce8c41 24e1103
Author: Vikram Aggarwal <viki@google.com>
Date:   Mon Sep 24 08:51:43 2012 -0700

    am 24e11036: am 016310a0: Fix account order.

    * commit '24e11036e76f735accb9bf812d2a657dce8f5c07':
      Fix account order.

commit dce8c41b070a10a67b957dec1e714e432c97206b
Merge: 1adfc35 d47027b
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 24 08:51:41 2012 -0700

    am d47027b9: am 114e3149: Return contentUri for all attachments

    * commit 'd47027b92d07342223b6094748787414ce22e549':
      Return contentUri for all attachments

commit 1adfc35e1182d3b0a253d8c18b860f710f0c4c76
Merge: d64cb0a bb34ef2
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 24 08:51:40 2012 -0700

    am bb34ef2d: am 54347010: Allow legacy imap to sync

    * commit 'bb34ef2d966590994ae424dbbaf626b0fd733aef':
      Allow legacy imap to sync

commit d64cb0aea5fe4810359aff9d893712664879cd80
Merge: eba67fa 2bbb937
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 24 08:51:39 2012 -0700

    am 2bbb9375: am 9f05983f: Merge "Prevent duplicate imap folders" into jb-ub-mail

    * commit '2bbb93750f02d0b3ac534b03d4279c82ef28a3a7':
      Prevent duplicate imap folders

commit f5f3eedadd1e388a5fe2f62408fda4f3bf42b77b
Merge: bad9c9a 4384596
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 24 00:50:15 2012 -0700

    am 43845967: (-s ours) am b0d793ab: am c4e9ebc6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '438459676cb1e4e5ece64139c069baf64a00c4d5':
      Import translations. DO NOT MERGE

commit bad9c9af0a03a863bd59bb2cfcbbdd348e4cef0e
Merge: 966b953 eb7938e
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 24 00:50:10 2012 -0700

    am eb7938ec: (-s ours) am 01517306: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

commit 966b95355db8425260a37077ff879e313334d237
Merge: 4a37ebf b4ec625
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 24 00:48:53 2012 -0700

    am b4ec6257: am 2b5e54f0: am 78b8c048: Add another test for "incomplete" accounts

    * commit 'b4ec62575a963e12a95763f3b957d4ee67f5ea81':
      Add another test for "incomplete" accounts

commit 4a37ebf99917840ce5304cbc13a964f407b5d230
Author: Baligh Uddin <baligh@google.com>
Date:   Sat Sep 22 12:12:44 2012 -0700

    Import translations. DO NOT MERGE

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

commit eba67fa653eb637ef1e90e9dcc23908a71210bf3
Author: Baligh Uddin <baligh@google.com>
Date:   Sat Sep 22 12:10:10 2012 -0700

    Import translations. DO NOT MERGE

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

commit 7f7a3aefd1b00543874f4391105dcb6e45b4f904
Merge: cba2dc9 b0d793a
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 21 17:48:52 2012 -0700

    am b0d793ab: (-s ours) am c4e9ebc6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

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

commit cba2dc9ea86775009ac2b900529bf968c82f0998
Merge: aedf6a7 0151730
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 21 17:48:49 2012 -0700

    am 01517306: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '0151730686ae9965fc021d57b9947b4e22179d4e':
      Import translations. DO NOT MERGE

commit aedf6a78794f1b7d61195104aba5c0b61c07ede7
Merge: b48cca8 2b5e54f
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 21 17:47:41 2012 -0700

    am 2b5e54f0: am 78b8c048: Add another test for "incomplete" accounts

    * commit '2b5e54f05926d4835f6c2a85eb5ef86df84d2a25':
      Add another test for "incomplete" accounts

commit b48cca84b2337cb11bae1ef8d1bebf056b647385
Merge: eb4703e 8218fac
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 21 17:46:48 2012 -0700

    am 8218face: am 733a1146: Add id to HashCode equals()

    * commit '8218facec81ada79821bf75d66ca24ee3ce9ef12':
      Add id to HashCode equals()

commit eb4703e458018bbe348619fe103864839ccfd7e6
Merge: c39c6cf c10a57f
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 21 17:45:45 2012 -0700

    am c10a57f9: am b6992942: Merge "Restore Imap1" into jb-ub-mail

    * commit 'c10a57f9660be8b1eaf4f9f779abf2a079e2ff81':
      Restore Imap1

commit c39c6cf1024dd546ad39d8f0469118c0bf6a1fd2
Merge: 7bd6803 c44d364
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 21 17:45:31 2012 -0700

    am c44d3649: (-s ours) am 37d6afb9: (-s ours) Import translations. DO NOT MERGE

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

commit 7bd680321c4e03de412b70247035743bd69dd106
Merge: 436ed88 40f8505
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 21 17:45:28 2012 -0700

    am 40f85052: (-s ours) Import translations. DO NOT MERGE

    * commit '40f8505247504c5bcb3497b37ed321ca604578c0':
      Import translations. DO NOT MERGE

commit 438459676cb1e4e5ece64139c069baf64a00c4d5
Merge: eb7938e b0d793a
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 21 15:16:34 2012 -0700

    am b0d793ab: am c4e9ebc6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

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

commit eb7938ec71f6f0139eae8234b9e6298aa96e3078
Merge: b4ec625 0151730
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 21 15:13:29 2012 -0700

    am 01517306: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '0151730686ae9965fc021d57b9947b4e22179d4e':
      Import translations. DO NOT MERGE

commit 9b7922c1d9b91adc923708f15b5fe0e9b0fab127
Merge: 2569aa5 ba96147
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 21 15:12:46 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit ba96147cacc4d3753dbd9292da11b09595e4536d
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 21 13:00:06 2012 -0700

    Import translations. DO NOT MERGE

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

commit 436ed885c7175399a078f2e999f2a109559025a5
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 21 12:56:16 2012 -0700

    Import translations. DO NOT MERGE

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

commit b4ec62575a963e12a95763f3b957d4ee67f5ea81
Merge: 588956b 2b5e54f
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 21 12:47:25 2012 -0700

    am 2b5e54f0: am 78b8c048: Add another test for "incomplete" accounts

    * commit '2b5e54f05926d4835f6c2a85eb5ef86df84d2a25':
      Add another test for "incomplete" accounts

commit 2569aa57dc7003de7120112348030080b4ff5ab9
Merge: dce7568 588956b
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 21 12:46:47 2012 -0700

    am 588956be: am 8218face: am 733a1146: Add id to HashCode equals()

    * commit '588956be09b1639a6b4207be24f09cd1b7494951':
      Add id to HashCode equals()

commit dce756806c0396f8dbfbe2a34c3235e39ba97256
Merge: 8db5606 24cf509
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 21 12:44:29 2012 -0700

    am 24cf509b: am c10a57f9: am b6992942: Merge "Restore Imap1" into jb-ub-mail

    * commit '24cf509b1051d1d05907742a34de2e6c03366d84':
      Restore Imap1

commit 8db5606726ebc3ed8b9051f8e02f558fe407c726
Merge: d3a2370 34c62e6
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 21 12:44:15 2012 -0700

    am 34c62e67: (-s ours) am c44d3649: am 37d6afb9: (-s ours) Import translations. DO NOT MERGE

    * commit '34c62e67fa6444b829122d7a0ee648d357991d5f':
      Import translations. DO NOT MERGE

commit d3a23704e5dc03073c50a9a418a3ce7c2b0fcdb5
Merge: 9ebb930 c322131
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 21 12:44:12 2012 -0700

    am c322131a: (-s ours) am 40f85052: Import translations. DO NOT MERGE

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

commit b8952f310fe3f5de5787bc9e9af626f11fa157fc
Merge: 4533186 f5bea52
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 21 11:04:50 2012 -0700

    am f5bea52c: am ec0af782: Merge "Quote username and password in login command" into jb-ub-mail

    * commit 'f5bea52c5cb8280eadf379acaf180bec99d91bca':
      Quote username and password in login command

commit 588956be09b1639a6b4207be24f09cd1b7494951
Merge: 24cf509 8218fac
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 21 10:37:20 2012 -0700

    am 8218face: am 733a1146: Add id to HashCode equals()

    * commit '8218facec81ada79821bf75d66ca24ee3ce9ef12':
      Add id to HashCode equals()

commit 24cf509b1051d1d05907742a34de2e6c03366d84
Merge: 34c62e6 c10a57f
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 21 09:08:02 2012 -0700

    am c10a57f9: am b6992942: Merge "Restore Imap1" into jb-ub-mail

    * commit 'c10a57f9660be8b1eaf4f9f779abf2a079e2ff81':
      Restore Imap1

commit 34c62e67fa6444b829122d7a0ee648d357991d5f
Merge: c322131 c44d364
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 21 07:32:45 2012 -0700

    am c44d3649: am 37d6afb9: (-s ours) Import translations. DO NOT MERGE

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

commit c322131a254ec564204208b8085e721d44a5277f
Merge: 7005a13 40f8505
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 21 07:29:52 2012 -0700

    am 40f85052: Import translations. DO NOT MERGE

    * commit '40f8505247504c5bcb3497b37ed321ca604578c0':
      Import translations. DO NOT MERGE

commit 9ebb9302b9368c3e842a32ea2472bb3c293cd3c2
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 20 14:52:38 2012 -0700

    Import translations. DO NOT MERGE

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

commit 4533186a7ad8aeeb01e1d1f28dc93643f92f980f
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 20 14:49:05 2012 -0700

    Import translations. DO NOT MERGE

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

commit d31ff23bf86a672a74425893a63b7ee0cfd4b978
Merge: de27c76 7005a13
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 20 12:56:41 2012 -0700

    am 7005a131: am f5bea52c: am ec0af782: Merge "Quote username and password in login command" into jb-ub-mail

    * commit '7005a131684b0c455f6ebb64faff2ff68677089a':
      Quote username and password in login command

commit 7005a131684b0c455f6ebb64faff2ff68677089a
Merge: ad2f456 f5bea52
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 20 12:51:59 2012 -0700

    am f5bea52c: am ec0af782: Merge "Quote username and password in login command" into jb-ub-mail

    * commit 'f5bea52c5cb8280eadf379acaf180bec99d91bca':
      Quote username and password in login command

commit de27c7641dfc3dc3d6ca1f254d1c8c4c3a9a3ccc
Merge: f3b5543 ad2f456
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 20 12:49:06 2012 -0700

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

    * commit 'ad2f4562f0b50c33296ddc24457e7f91a0e536e9':
      Don't smartsend reply inappropriately
      Use correct test for updating attachment contentUri

commit ad2f4562f0b50c33296ddc24457e7f91a0e536e9
Merge: 199a2da d10f945
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 20 10:36:32 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ib8d04ae3401635fce3204253b373d7042f2f34ab

commit f3b55430b799b02d28f972da805c49353c1252ed
Merge: f8669d1 199a2da
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Sep 20 09:35:47 2012 -0700

    am 199a2da3: am b6b843d8: am 0a54d7ee: Merge "increment versionCode" into jb-ub-mail

    * commit '199a2da34c9f44de31094b29378028ca48c6fa43':
      increment versionCode

commit f8669d1f2ca09423218e5a6114064f902550bdfb
Merge: 5bc2724 8bf26fb
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Sep 20 09:35:44 2012 -0700

    am 8bf26fbd: am 6e0816d9: am 652a9076: Hide reply all setting on tablets

    * commit '8bf26fbd59b39a376ddb1a2a8ffa7311373d2eaf':
      Hide reply all setting on tablets

commit 5bc27248970b0bab605734401026ae1f2e9e6de8
Merge: 464748b 5d3d9d7
Author: Yorke Lee <yorkelee@google.com>
Date:   Thu Sep 20 09:35:34 2012 -0700

    am 5d3d9d79: am 56991a7f: am 4b4d984d: Merge "Correct icon for folder/account selection" into jb-ub-mail

    * commit '5d3d9d7995806f88b535653a86cedb05d48c18b9':
      Correct icon for folder/account selection

commit 464748b6b3d2b2d1f1ffc31616bb96afd3503ac5
Merge: cd73d25 f33ad3e
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 20 09:35:32 2012 -0700

    am f33ad3e5: (-s ours) am 94f79842: am f4325491: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

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

commit cd73d25a9fea0487db372a140e7b2e0003860d15
Merge: edc82ce 1432a57
Author: Mark Wei <markwei@google.com>
Date:   Thu Sep 20 09:35:31 2012 -0700

    am 1432a57c: am d4534426: am 533c4ff9: Merge "Fix Email widget preview using wrong resource." into jb-ub-mail

    * commit '1432a57cca691b937984c2b30e59c86f3a44f181':
      Fix Email widget preview using wrong resource.

commit edc82ce95bcb24f2e48ddc0cd6ea0d541a198e40
Merge: 5c480cc 5bc4be8
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 20 09:35:30 2012 -0700

    am 5bc4be85: am af6c077a: am 67439a3e: Add translatable=false as required

    * commit '5bc4be851c33be3defaea5df8a675dce2f31414f':
      Add translatable=false as required

commit 5c480cc9cccef86cbc5cb42f5aa3935aade38b16
Merge: db2de5e 61b2427
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 20 09:35:28 2012 -0700

    am 61b2427c: (-s ours) am b6e7bfa1: Import translations. DO NOT MERGE

    * commit '61b2427c7bc7a6ad3fca67692efba502ef27ae88':
      Import translations. DO NOT MERGE

commit 18dc3896762137c576b2427e2bff936bc26805c6
Merge: cdeba0d b6b843d
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Sep 20 09:06:32 2012 -0700

    am b6b843d8: am 0a54d7ee: Merge "increment versionCode" into jb-ub-mail

    * commit 'b6b843d8aa9c58b8c86200e18190fa4107dd4c5e':
      increment versionCode

commit 199a2da34c9f44de31094b29378028ca48c6fa43
Merge: 8bf26fb b6b843d
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Sep 20 09:04:34 2012 -0700

    am b6b843d8: am 0a54d7ee: Merge "increment versionCode" into jb-ub-mail

    * commit 'b6b843d8aa9c58b8c86200e18190fa4107dd4c5e':
      increment versionCode

commit cdeba0d9101451d68ebe694be32de99a87a506e8
Merge: cef867e 6e0816d
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Sep 20 09:01:38 2012 -0700

    am 6e0816d9: am 652a9076: Hide reply all setting on tablets

    * commit '6e0816d9b0b79830aaab34dfddb3271d4a6160b5':
      Hide reply all setting on tablets

commit 8bf26fbd59b39a376ddb1a2a8ffa7311373d2eaf
Merge: 5d3d9d7 6e0816d
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Sep 20 09:01:33 2012 -0700

    am 6e0816d9: am 652a9076: Hide reply all setting on tablets

    * commit '6e0816d9b0b79830aaab34dfddb3271d4a6160b5':
      Hide reply all setting on tablets

commit 5d3d9d7995806f88b535653a86cedb05d48c18b9
Merge: f33ad3e 56991a7
Author: Yorke Lee <yorkelee@google.com>
Date:   Thu Sep 20 07:47:20 2012 -0700

    am 56991a7f: am 4b4d984d: Merge "Correct icon for folder/account selection" into jb-ub-mail

    * commit '56991a7f981e97653748031e52ddf92ae2af4c68':
      Correct icon for folder/account selection

commit f33ad3e574be1aa6518b41d0517ec4220b60b1ed
Merge: 1432a57 94f7984
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 20 07:47:20 2012 -0700

    am 94f79842: am f4325491: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '94f798428733037b2a2f9876803e482679fc619b':
      Import translations. DO NOT MERGE

commit 1432a57cca691b937984c2b30e59c86f3a44f181
Merge: 5bc4be8 d453442
Author: Mark Wei <markwei@google.com>
Date:   Thu Sep 20 07:47:20 2012 -0700

    am d4534426: am 533c4ff9: Merge "Fix Email widget preview using wrong resource." into jb-ub-mail

    * commit 'd453442670eb3d755d932350a19a1b4b3745c4c5':
      Fix Email widget preview using wrong resource.

commit 5bc4be851c33be3defaea5df8a675dce2f31414f
Merge: 61b2427 af6c077
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 20 07:47:19 2012 -0700

    am af6c077a: am 67439a3e: Add translatable=false as required

    * commit 'af6c077ac614fa3432f8bde469a186b9d3fec00b':
      Add translatable=false as required

commit 61b2427c7bc7a6ad3fca67692efba502ef27ae88
Merge: 128d9b4 b6e7bfa
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 20 07:47:19 2012 -0700

    am b6e7bfa1: Import translations. DO NOT MERGE

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

commit cef867e1c46ad067cb7b39c5b208a5bb2c73762a
Merge: 7cdfaaa 56991a7
Author: Yorke Lee <yorkelee@google.com>
Date:   Thu Sep 20 06:43:08 2012 -0700

    am 56991a7f: am 4b4d984d: Merge "Correct icon for folder/account selection" into jb-ub-mail

    * commit '56991a7f981e97653748031e52ddf92ae2af4c68':
      Correct icon for folder/account selection

commit 7cdfaaa44546b86945188a8a2c96d35c21fbc174
Merge: 85b2e55 94f7984
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 20 06:20:57 2012 -0700

    am 94f79842: (-s ours) am f4325491: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '94f798428733037b2a2f9876803e482679fc619b':
      Import translations. DO NOT MERGE

commit 85b2e55b80911691cb3d91f6f3de8cf2ea58a02e
Merge: 1fb1b9c d453442
Author: Mark Wei <markwei@google.com>
Date:   Thu Sep 20 06:20:56 2012 -0700

    am d4534426: am 533c4ff9: Merge "Fix Email widget preview using wrong resource." into jb-ub-mail

    * commit 'd453442670eb3d755d932350a19a1b4b3745c4c5':
      Fix Email widget preview using wrong resource.

commit 1fb1b9c8df1ece380a90bede3ece3963d5217d5b
Merge: d339018 af6c077
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 20 06:20:54 2012 -0700

    am af6c077a: am 67439a3e: Add translatable=false as required

    * commit 'af6c077ac614fa3432f8bde469a186b9d3fec00b':
      Add translatable=false as required

commit d339018ef35e15697c9cd4270ec200a712f6d62b
Merge: 09b2200 b6e7bfa
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 20 06:20:47 2012 -0700

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

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

commit 09b220066e59589dc433a20bd61cffd6eb04d7af
Merge: 59b2d1a 0a836b8
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 20 06:20:22 2012 -0700

    am 0a836b81: am 72d7dda9: Improve service dump a bit

    * commit '0a836b815350c7264dc85fdb2b0540f6cbe75a3b':
      Improve service dump a bit

commit 59b2d1a694691c4eb0c08ceaa32cb4ad0a15ccd0
Merge: ccd85b5 a2679bc
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 20 06:19:36 2012 -0700

    am a2679bc1: am 9a6ad1fa: Merge "Add bugreport dump of wake lock times" into jb-ub-mail

    * commit 'a2679bc155f5e788a7cfee113ccbdd0be92fe1d5':
      Add bugreport dump of wake lock times

commit ccd85b5f8079bf9d058cfbf24af3770f7274db45
Merge: d966d7a 63aafc9
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Sep 20 06:18:50 2012 -0700

    am 63aafc94: am 5e1db519: Fix crash when the Email process is killed

    * commit '63aafc94c9570ca4719d832b68b9ba025a405224':
      Fix crash when the Email process is killed

commit db2de5e2eb791a9cc2ad716e6e432a7d5c0fff68
Merge: 98cfc26 128d9b4
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 19 15:21:24 2012 -0700

    am 128d9b43: am 0a836b81: am 72d7dda9: Improve service dump a bit

    * commit '128d9b43f45424a0eaeb6dfd6124013a1d2b7bb6':
      Improve service dump a bit

commit 98cfc26b943cb6e28224273fe702b6a2b1145f83
Merge: 6d9a190 16ecfb1
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 19 15:20:37 2012 -0700

    am 16ecfb18: am a2679bc1: am 9a6ad1fa: Merge "Add bugreport dump of wake lock times" into jb-ub-mail

    * commit '16ecfb1827e040688a9686d05a13b6c2487fb6fd':
      Add bugreport dump of wake lock times

commit 6d9a190503893245d2afcf8570e2859c65ed8f30
Merge: f3d9eaa 148973b
Author: Paul Westbrook <pwestbro@google.com>
Date:   Wed Sep 19 15:19:53 2012 -0700

    am 148973b6: am 63aafc94: am 5e1db519: Fix crash when the Email process is killed

    * commit '148973b6c7b50fd06499857ea5d88841e4f06135':
      Fix crash when the Email process is killed

commit 128d9b43f45424a0eaeb6dfd6124013a1d2b7bb6
Merge: 16ecfb1 0a836b8
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 19 14:08:48 2012 -0700

    am 0a836b81: am 72d7dda9: Improve service dump a bit

    * commit '0a836b815350c7264dc85fdb2b0540f6cbe75a3b':
      Improve service dump a bit

commit f3d9eaa4473c3c7ac6eac68e1c25a3dc246873ed
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Sep 19 14:02:46 2012 -0700

    Import translations. DO NOT MERGE

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

commit d966d7a708607caa0070b83d65367d519442580f
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Sep 19 13:59:04 2012 -0700

    Import translations. DO NOT MERGE

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

commit 16ecfb1827e040688a9686d05a13b6c2487fb6fd
Merge: 148973b a2679bc
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 19 11:32:07 2012 -0700

    am a2679bc1: am 9a6ad1fa: Merge "Add bugreport dump of wake lock times" into jb-ub-mail

    * commit 'a2679bc155f5e788a7cfee113ccbdd0be92fe1d5':
      Add bugreport dump of wake lock times

commit 54c1b6b8311f0044046fbce9e6d7f72d9dbfe42d
Merge: d77f258 84fea14
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Sep 19 09:51:00 2012 -0700

    Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

commit 148973b6c7b50fd06499857ea5d88841e4f06135
Merge: b43188a 63aafc9
Author: Paul Westbrook <pwestbro@google.com>
Date:   Wed Sep 19 09:21:12 2012 -0700

    am 63aafc94: am 5e1db519: Fix crash when the Email process is killed

    * commit '63aafc94c9570ca4719d832b68b9ba025a405224':
      Fix crash when the Email process is killed

commit 6accc9a540b62d61e28a952eeda25988e848d3a7
Merge: 6536ad4 b43188a
Author: Paul Westbrook <pwestbro@google.com>
Date:   Wed Sep 19 05:50:32 2012 -0700

    am b43188a3: am c83f4fd0: am fb42a915: Merge "Fix crash with Email widget" into jb-ub-mail

    * commit 'b43188a33f5a50366d42e6897f7470281742ded1':
      Fix crash with Email widget

commit d77f258ede3e046393325b37cfb9c3254c935243
Merge: 41e9d59 c83f4fd
Author: Paul Westbrook <pwestbro@google.com>
Date:   Tue Sep 18 18:26:23 2012 -0700

    am c83f4fd0: am fb42a915: Merge "Fix crash with Email widget" into jb-ub-mail

    * commit 'c83f4fd04c9bde97a27e520dec1fd2cd12c4aa7b':
      Fix crash with Email widget

commit b43188a33f5a50366d42e6897f7470281742ded1
Merge: f3f1322 c83f4fd
Author: Paul Westbrook <pwestbro@google.com>
Date:   Tue Sep 18 18:23:53 2012 -0700

    am c83f4fd0: am fb42a915: Merge "Fix crash with Email widget" into jb-ub-mail

    * commit 'c83f4fd04c9bde97a27e520dec1fd2cd12c4aa7b':
      Fix crash with Email widget

commit 6536ad48991d3c26fa980b6207874b919afcdbc4
Merge: 5547d55 f3f1322
Author: Mindy Pereira <mindyp@google.com>
Date:   Tue Sep 18 17:55:32 2012 -0700

    am f3f13221: am 0b623fa7: am 58e3a2da: Merge "Return Mindy\'s senders" into jb-ub-mail

    * commit 'f3f13221760c761b01bf284607074d929f392f03':
      Return Mindy's senders

commit 41e9d59ceee2c2ff378d75b18c14a5611999ccfe
Merge: af6d844 0b623fa
Author: Mindy Pereira <mindyp@google.com>
Date:   Tue Sep 18 17:54:33 2012 -0700

    am 0b623fa7: am 58e3a2da: Merge "Return Mindy\'s senders" into jb-ub-mail

    * commit '0b623fa7f823fcc730bc42afa4b480ba0779513e':
      Return Mindy's senders

commit f3f13221760c761b01bf284607074d929f392f03
Merge: 2d8f305 0b623fa
Author: Mindy Pereira <mindyp@google.com>
Date:   Tue Sep 18 17:49:40 2012 -0700

    am 0b623fa7: am 58e3a2da: Merge "Return Mindy\'s senders" into jb-ub-mail

    * commit '0b623fa7f823fcc730bc42afa4b480ba0779513e':
      Return Mindy's senders

commit 5547d554bdc5f454334f2d06fa3e95239a814e15
Merge: 15ae098 2d8f305
Author: mindyp <mindyp@google.com>
Date:   Tue Sep 18 17:16:39 2012 -0700

    am 2d8f3056: am d6243bd5: am 8ff282a2: Lots of fixes to line up with new multi/single move to folder dialog.

    * commit '2d8f30569c56d46709564dfba5494cfd99a8ba36':
      Lots of fixes to line up with new multi/single move to folder dialog.

commit 2d8f30569c56d46709564dfba5494cfd99a8ba36
Merge: 93687d7 d6243bd
Author: mindyp <mindyp@google.com>
Date:   Tue Sep 18 16:54:53 2012 -0700

    am d6243bd5: am 8ff282a2: Lots of fixes to line up with new multi/single move to folder dialog.

    * commit 'd6243bd52ea6498c05ecd76e46d5c69ab56d0dea':
      Lots of fixes to line up with new multi/single move to folder dialog.

commit af6d844480cefc382f4abf00ef2e550688296eab
Merge: 415cb99 d6243bd
Author: mindyp <mindyp@google.com>
Date:   Tue Sep 18 16:34:21 2012 -0700

    am d6243bd5: am 8ff282a2: Lots of fixes to line up with new multi/single move to folder dialog.

    * commit 'd6243bd52ea6498c05ecd76e46d5c69ab56d0dea':
      Lots of fixes to line up with new multi/single move to folder dialog.

commit 15ae09863075a20768fa472c31297d2caf555e0f
Merge: 6ee75c8 93687d7
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 18 15:33:41 2012 -0700

    am 93687d77: am 7048ceb7: am b203b2b1: Remove useless class and crazy UIDL logging

    * commit '93687d774296427f109b33bd61f4b461eda715fc':
      Remove useless class and crazy UIDL logging

commit 93687d774296427f109b33bd61f4b461eda715fc
Merge: 9c582d2 7048ceb
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 18 15:23:34 2012 -0700

    am 7048ceb7: am b203b2b1: Remove useless class and crazy UIDL logging

    * commit '7048ceb73c0c69855706b71181488002ab624e45':
      Remove useless class and crazy UIDL logging

commit 415cb996c97c886484f754678f2b5953692f8e48
Merge: 71482a9 7048ceb
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 18 15:20:38 2012 -0700

    am 7048ceb7: am b203b2b1: Remove useless class and crazy UIDL logging

    * commit '7048ceb73c0c69855706b71181488002ab624e45':
      Remove useless class and crazy UIDL logging

commit 6ee75c88c6d7719a91e0dfaa64bf54e1af7a46a6
Merge: 59cd5de 9c582d2
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 18 12:27:43 2012 -0700

    am 9c582d24: am d42afadc: am 887ea25e: Merge "Show display name in convo list" into jb-ub-mail

    * commit '9c582d24833c6cd7d52d043a7f6e24e4259581ee':
      Show display name in convo list

commit 71482a96f696e39ffe1e28bca15cc46d834e7a0e
Merge: 355aaab d42afad
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 18 12:16:33 2012 -0700

    am d42afadc: am 887ea25e: Merge "Show display name in convo list" into jb-ub-mail

    * commit 'd42afadc5af35e3c06c3f3024498e51b6928bf7f':
      Show display name in convo list

commit 9c582d24833c6cd7d52d043a7f6e24e4259581ee
Merge: d34fbcc d42afad
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 18 12:15:06 2012 -0700

    am d42afadc: am 887ea25e: Merge "Show display name in convo list" into jb-ub-mail

    * commit 'd42afadc5af35e3c06c3f3024498e51b6928bf7f':
      Show display name in convo list

commit 355aaab69bb7794e292875ce06faa038392e38c5
Merge: 7dfffb6 668dd92
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 18 10:44:17 2012 -0700

    am 668dd921: am eaf7e3bc: Don\'t smartsend reply inappropriately

    * commit '668dd9211fef4214a7aa16b3b32ee3c80e4e3850':
      Don't smartsend reply inappropriately

commit 7dfffb622ec93ad5ece9e91b5e52eadfa2b3ec02
Merge: 346de78 bc5080f
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 18 10:44:16 2012 -0700

    am bc5080fd: am 67a33ca9: Merge "Properly check for deleted messages" into jb-ub-mail

    * commit 'bc5080fdb7668da367ecca1bcaf6edd72a87d517':
      Properly check for deleted messages

commit 59cd5de1b7dacf9ee0352771e914dd70c3137133
Merge: 18e2bdf d34fbcc
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 18 10:28:29 2012 -0700

    am d34fbcc9: am 668dd921: am eaf7e3bc: Don\'t smartsend reply inappropriately

    * commit 'd34fbcc9215db647a99739403fe335d256523d9b':
      Don't smartsend reply inappropriately

commit 18e2bdff7f1a6f8ef96b1af7f8186b877b463268
Merge: f300268 9fd79fe
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 18 10:28:28 2012 -0700

    am 9fd79fe9: am bc5080fd: am 67a33ca9: Merge "Properly check for deleted messages" into jb-ub-mail

    * commit '9fd79fe9f6ffdec26cdb9c19d9f2273ee5a33828':
      Properly check for deleted messages

commit d34fbcc9215db647a99739403fe335d256523d9b
Merge: 9fd79fe 668dd92
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 18 10:16:41 2012 -0700

    am 668dd921: am eaf7e3bc: Don\'t smartsend reply inappropriately

    * commit '668dd9211fef4214a7aa16b3b32ee3c80e4e3850':
      Don't smartsend reply inappropriately

commit 9fd79fe9f6ffdec26cdb9c19d9f2273ee5a33828
Merge: 8627fc0 bc5080f
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 18 10:16:40 2012 -0700

    am bc5080fd: am 67a33ca9: Merge "Properly check for deleted messages" into jb-ub-mail

    * commit 'bc5080fdb7668da367ecca1bcaf6edd72a87d517':
      Properly check for deleted messages

commit 84fea144f7904833697a092d07b735339d205872
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Sep 18 09:09:30 2012 -0700

    Import translations. DO NOT MERGE

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

commit f300268057a6a97b2c26d5c87fa6fe466aa93e0a
Merge: 7438337 8627fc0
Author: Paul Westbrook <pwestbro@google.com>
Date:   Tue Sep 18 00:10:48 2012 -0700

    am 8627fc07: am df0f27ed: am eb14c19e: increment versionCode

    * commit '8627fc07a8ed593fa7cd9563c9fd001988a0f5a0':
      increment versionCode

commit 8627fc07a8ed593fa7cd9563c9fd001988a0f5a0
Merge: 4281631 df0f27e
Author: Paul Westbrook <pwestbro@google.com>
Date:   Tue Sep 18 00:04:49 2012 -0700

    am df0f27ed: am eb14c19e: increment versionCode

    * commit 'df0f27ed10ded0001b18cf744d09e48312592181':
      increment versionCode

commit 346de784c02ecce7daa342e4bb7a70cfcdd944db
Merge: 295e419 df0f27e
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Sep 17 21:13:35 2012 -0700

    am df0f27ed: am eb14c19e: increment versionCode

    * commit 'df0f27ed10ded0001b18cf744d09e48312592181':
      increment versionCode

commit 7438337e1bbe20b4de5281cd4db349531e007ac4
Merge: 75b0c68 4281631
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 17 14:54:47 2012 -0700

    am 4281631b: (-s ours) am 6ef169ce: am d6e4c7ae: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '4281631b1782b8086602e3f4721d15d8ed38cc07':
      Import translations. DO NOT MERGE

commit 75b0c688e1e8a880d84670a2577f470986f97bd6
Merge: eee94e0 12d06d4
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 17 14:54:45 2012 -0700

    am 12d06d46: (-s ours) am 32820ef1: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '12d06d466f0c93d1a3e78e821b4f5688d3d10f6a':
      Import translations. DO NOT MERGE

commit eee94e0120f18ddcaaa9c78ab03bc74ec793d39c
Merge: fc102ab e9d15da
Author: Nick Kralevich <nnk@google.com>
Date:   Mon Sep 17 14:54:11 2012 -0700

    am e9d15da5: (-s ours) am 11ce6313: am b9929c8c: (-s ours) DO NOT MERGE Explicitly export content providers

    * commit 'e9d15da55962c2b063877a3eb4af4d6654fbf203':
      DO NOT MERGE Explicitly export content providers

commit fc102abe165b76935d3c3655e44bd67c0e475672
Merge: cfe3229 73f9fda
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 17 14:43:59 2012 -0700

    am 73f9fdae: am 29b3a34f: am a1b2b325: Revert "Export providers explicitly"

    * commit '73f9fdaee2fc401edda2289884f7442a0d112c04':
      Revert "Export providers explicitly"

commit cfe32295bfe0a59cbdbfb5c870d82341bb936d9e
Merge: 1ee140d 3ee978c
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 17 14:43:57 2012 -0700

    am 3ee978cf: am 1c469f7f: am a256453a: Export providers explicitly

    * commit '3ee978cf468ab19ae44ee16dfeb195ac607e0e83':
      Export providers explicitly

commit 1ee140d11a720f377c292376ff34020706b4e5fd
Merge: 846fe49 83c1c65
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 17 14:43:42 2012 -0700

    am 83c1c65d: am 60941b73: am 558a14fc: Merge "Don\'t delete smart-forward attachments" into jb-ub-mail

    * commit '83c1c65dec7e8de3ccb2c094d23608c2d6b4b72d':
      Don't delete smart-forward attachments

commit 846fe4901ad16fca7a3426cf0eca27f911e88c22
Merge: e154715 1304c1a
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 17 14:43:40 2012 -0700

    am 1304c1ad: am 60061a46: am 00d17498: Merge "Make sure provider is initialized before setServicesEnabled()" into jb-ub-mail

    * commit '1304c1add797663da489b4e12ba0b277612c29fc':
      Make sure provider is initialized before setServicesEnabled()

commit 295e4191e518e1b7bdef33fc1eee4271aa31fe32
Merge: f4e6c35 6ef169c
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 17 14:06:11 2012 -0700

    am 6ef169ce: (-s ours) am d6e4c7ae: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '6ef169ceaa576b54317a494d9d0fcc3aa902a9cf':
      Import translations. DO NOT MERGE

commit f4e6c35814bce4e917be3c6ab439f2e3c9cd97d2
Merge: 389aa6a 32820ef
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 17 14:06:10 2012 -0700

    am 32820ef1: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '32820ef1c974b84cc06852884e6ba3c1c32af745':
      Import translations. DO NOT MERGE

commit 4281631b1782b8086602e3f4721d15d8ed38cc07
Merge: 12d06d4 6ef169c
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 17 14:05:38 2012 -0700

    am 6ef169ce: am d6e4c7ae: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '6ef169ceaa576b54317a494d9d0fcc3aa902a9cf':
      Import translations. DO NOT MERGE

commit 12d06d466f0c93d1a3e78e821b4f5688d3d10f6a
Merge: e9d15da 32820ef
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 17 14:05:37 2012 -0700

    am 32820ef1: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '32820ef1c974b84cc06852884e6ba3c1c32af745':
      Import translations. DO NOT MERGE

commit e15471515774fc89cca3a30f6a0feccd0cf869a7
Merge: 458219a 8c28a3d
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 17 14:02:41 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit 389aa6a2ab74ddb58b6ccf58f29cd0d3e2eec05f
Merge: 0ab6395 11ce631
Author: Nick Kralevich <nnk@google.com>
Date:   Mon Sep 17 13:11:15 2012 -0700

    am 11ce6313: (-s ours) am b9929c8c: (-s ours) DO NOT MERGE Explicitly export content providers

    * commit '11ce63134bcb0648fdc37099e10f5e8b1ba5cb0f':
      DO NOT MERGE Explicitly export content providers

commit e9d15da55962c2b063877a3eb4af4d6654fbf203
Merge: 73f9fda 11ce631
Author: Nick Kralevich <nnk@google.com>
Date:   Mon Sep 17 13:11:03 2012 -0700

    am 11ce6313: am b9929c8c: (-s ours) DO NOT MERGE Explicitly export content providers

    * commit '11ce63134bcb0648fdc37099e10f5e8b1ba5cb0f':
      DO NOT MERGE Explicitly export content providers

commit 458219a972d37841cec81125d4ed9e8b2f3efb3c
Merge: c077f0d 806ce2b
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 17 12:45:58 2012 -0700

    am 806ce2ba: (-s ours) am 65ca9fd2: am 6171a9fc: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '806ce2ba19be28ecf00d40ae9e8d8f84096b7bcd':
      Import translations. DO NOT MERGE

commit c077f0d75bdfab5e74be55d9942e574c037c52aa
Merge: 425de97 2a5e9e4
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 17 12:45:54 2012 -0700

    am 2a5e9e4b: (-s ours) am 24f74569: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '2a5e9e4b4dfea2cfe5b91dd820f7f38b1ddb19a9':
      Import translations. DO NOT MERGE

commit 8c28a3db70cc59d88007bcc750ca6d07b1cca132
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 17 12:00:03 2012 -0700

    Import translations. DO NOT MERGE

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

commit 425de9743e09527f14683a98c07de7f41eeadae1
Merge: 4038675 a4a8a0e
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 17 11:29:58 2012 -0700

    am a4a8a0e8: am 1a34f565: am f53dc340: Merge "Prevent infinite loops (ugh); fix list parsing" into jb-ub-mail

    * commit 'a4a8a0e8ee5d9026e5cabc0cbe0e6da38c6606e2':
      Prevent infinite loops (ugh); fix list parsing

commit 403867558ec9d98dd33ade8e92bfb154bd2195f3
Merge: 50dd20f 1c8433a
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Sep 17 10:28:53 2012 -0700

    am 1c8433af: am f6d17726: am f81b5409: Build against the MR1 sdk

    * commit '1c8433af08fe41b5bc7060dea3d3e54d8b6dadd4':
      Build against the MR1 sdk

commit 0ab639538b790b048ebacef344af0f0b8590ce1f
Merge: 83bb37b 29b3a34
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 15 18:58:25 2012 -0700

    am 29b3a34f: am a1b2b325: Revert "Export providers explicitly"

    * commit '29b3a34fa2f73dc8cfb3a91e128157c3b9fbfc01':
      Revert "Export providers explicitly"

commit 73f9fdaee2fc401edda2289884f7442a0d112c04
Merge: 3ee978c 29b3a34
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 15 18:58:20 2012 -0700

    am 29b3a34f: am a1b2b325: Revert "Export providers explicitly"

    * commit '29b3a34fa2f73dc8cfb3a91e128157c3b9fbfc01':
      Revert "Export providers explicitly"

commit 83bb37b765a6c126b7036f5514159843a19c9319
Merge: a09f69b 1c469f7
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 15 18:32:55 2012 -0700

    am 1c469f7f: am a256453a: Export providers explicitly

    * commit '1c469f7fcb470b01c97c377863f3ebdc1aa99ca6':
      Export providers explicitly

commit 3ee978cf468ab19ae44ee16dfeb195ac607e0e83
Merge: 83c1c65 1c469f7
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 15 18:32:51 2012 -0700

    am 1c469f7f: am a256453a: Export providers explicitly

    * commit '1c469f7fcb470b01c97c377863f3ebdc1aa99ca6':
      Export providers explicitly

commit a09f69b45746a5ff7f3c6fe46f7cd1e2b7918248
Merge: b84eb60 60941b7
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 15 16:12:31 2012 -0700

    am 60941b73: am 558a14fc: Merge "Don\'t delete smart-forward attachments" into jb-ub-mail

    * commit '60941b731b4112cb79dbec3b87419c825bd49270':
      Don't delete smart-forward attachments

commit b84eb60d9f8e333b188c7f71200b6cb2aba8fb26
Merge: 0d345ed 60061a4
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 15 16:12:30 2012 -0700

    am 60061a46: am 00d17498: Merge "Make sure provider is initialized before setServicesEnabled()" into jb-ub-mail

    * commit '60061a460f1a9cc90ba83e5c15e4bbd1a3a72ab7':
      Make sure provider is initialized before setServicesEnabled()

commit 83c1c65dec7e8de3ccb2c094d23608c2d6b4b72d
Merge: 1304c1a 60941b7
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 15 16:12:12 2012 -0700

    am 60941b73: am 558a14fc: Merge "Don\'t delete smart-forward attachments" into jb-ub-mail

    * commit '60941b731b4112cb79dbec3b87419c825bd49270':
      Don't delete smart-forward attachments

commit 1304c1add797663da489b4e12ba0b277612c29fc
Merge: 806ce2b 60061a4
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 15 16:12:11 2012 -0700

    am 60061a46: am 00d17498: Merge "Make sure provider is initialized before setServicesEnabled()" into jb-ub-mail

    * commit '60061a460f1a9cc90ba83e5c15e4bbd1a3a72ab7':
      Make sure provider is initialized before setServicesEnabled()

commit 0d345ed395c5f73ffb0dbb11fb0f8171bc8d366c
Merge: 5b0df39 65ca9fd
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 14 16:48:17 2012 -0700

    am 65ca9fd2: (-s ours) am 6171a9fc: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '65ca9fd274ea9f660947a2cb22d215484ed34887':
      Import translations. DO NOT MERGE

commit 806ce2ba19be28ecf00d40ae9e8d8f84096b7bcd
Merge: 2a5e9e4 65ca9fd
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 14 16:48:11 2012 -0700

    am 65ca9fd2: am 6171a9fc: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '65ca9fd274ea9f660947a2cb22d215484ed34887':
      Import translations. DO NOT MERGE

commit 5b0df3990a415a95e8a5ce474c5fbc18b887e752
Merge: bc85cae 24f7456
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 14 16:45:17 2012 -0700

    am 24f74569: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '24f74569bddc5d6a2c8f36b0d9347a61ca06b945':
      Import translations. DO NOT MERGE

commit 2a5e9e4b4dfea2cfe5b91dd820f7f38b1ddb19a9
Merge: a4a8a0e 24f7456
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 14 16:45:09 2012 -0700

    am 24f74569: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '24f74569bddc5d6a2c8f36b0d9347a61ca06b945':
      Import translations. DO NOT MERGE

commit bc85cae792b97784ca195f322ace430b19bc102d
Merge: 6425cd7 1a34f56
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 14 14:58:52 2012 -0700

    am 1a34f565: am f53dc340: Merge "Prevent infinite loops (ugh); fix list parsing" into jb-ub-mail

    * commit '1a34f565caa930bf3df78b3ac6a658e1eab80fa1':
      Prevent infinite loops (ugh); fix list parsing

commit a4a8a0e8ee5d9026e5cabc0cbe0e6da38c6606e2
Merge: 1c8433a 1a34f56
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 14 14:58:31 2012 -0700

    am 1a34f565: am f53dc340: Merge "Prevent infinite loops (ugh); fix list parsing" into jb-ub-mail

    * commit '1a34f565caa930bf3df78b3ac6a658e1eab80fa1':
      Prevent infinite loops (ugh); fix list parsing

commit 50dd20f28a0f4cb8b2a0ff6dfef15b392014d99a
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 14 11:50:27 2012 -0700

    Import translations. DO NOT MERGE

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

commit 6425cd75220ae5962ca7d70adb5bf6be29cce5b5
Merge: f30ad9b f6d1772
Author: Paul Westbrook <pwestbro@google.com>
Date:   Fri Sep 14 11:27:04 2012 -0700

    am f6d17726: am f81b5409: Build against the MR1 sdk

    * commit 'f6d177266707a8764a0ed3d1b774c6d50ee5a049':
      Build against the MR1 sdk

commit 1c8433af08fe41b5bc7060dea3d3e54d8b6dadd4
Merge: 70d594a f6d1772
Author: Paul Westbrook <pwestbro@google.com>
Date:   Fri Sep 14 11:26:52 2012 -0700

    am f6d17726: am f81b5409: Build against the MR1 sdk

    * commit 'f6d177266707a8764a0ed3d1b774c6d50ee5a049':
      Build against the MR1 sdk

commit 0eb1b7a5699533b5ba63a79b483b8f5f34116c9a
Merge: 99e054c 70d594a
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 14 10:30:41 2012 -0700

    am 70d594af: (-s ours) am 735463bc: am d59dd833: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '70d594af5513d0f0fdbf0bee343fefafbc606903':
      Import translations. DO NOT MERGE

commit 99e054c1bb7ffb6f660ef15521fa448bc9634f93
Merge: 6b30466 90e3854
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 14 10:30:40 2012 -0700

    am 90e3854e: (-s ours) am 6fff0d19: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '90e3854e5f81d2f1eb7a028520a970315217ee91':
      Import translations. DO NOT MERGE

commit 6b3046680ef658a88e1daf74de21de0b6f39b38a
Merge: 29ac527 832b560
Author: mindyp <mindyp@google.com>
Date:   Fri Sep 14 10:29:01 2012 -0700

    am 832b5609: am b1c8ce62: am 939d15eb: Bump version

    * commit '832b5609d34ec8f92c51e0d380950a24e5d3aeda':
      Bump version

commit f30ad9b4857938a6d1b3e5989864d64197b54f5e
Merge: 131dfee 735463b
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 13 22:21:27 2012 -0700

    am 735463bc: (-s ours) am d59dd833: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '735463bc13ded7ead2a6fe74fb8013ca32191d26':
      Import translations. DO NOT MERGE

commit 70d594af5513d0f0fdbf0bee343fefafbc606903
Merge: 90e3854 735463b
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 13 22:21:07 2012 -0700

    am 735463bc: am d59dd833: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '735463bc13ded7ead2a6fe74fb8013ca32191d26':
      Import translations. DO NOT MERGE

commit 90e3854e5f81d2f1eb7a028520a970315217ee91
Merge: 832b560 6fff0d1
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 13 22:18:35 2012 -0700

    am 6fff0d19: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '6fff0d190d260f8dd2d2265f57b0da8f16aa81b5':
      Import translations. DO NOT MERGE

commit 131dfee2cddb3036dc068ba29a78c8e94e0fdcaa
Merge: 1f25a2f 6fff0d1
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 13 22:17:43 2012 -0700

    am 6fff0d19: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '6fff0d190d260f8dd2d2265f57b0da8f16aa81b5':
      Import translations. DO NOT MERGE

commit 29ac5274457b781c06b205142e566da66d388b35
Merge: 865fc7b 2b9a37c
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 13 22:14:41 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit 1f25a2fc099d9d112e48aa944037ea60ab3ac706
Merge: 60f7026 b1c8ce6
Author: mindyp <mindyp@google.com>
Date:   Thu Sep 13 18:11:44 2012 -0700

    am b1c8ce62: am 939d15eb: Bump version

    * commit 'b1c8ce62dacf5b4e2ba3c8aec150c15dd88a9ca1':
      Bump version

commit 832b5609d34ec8f92c51e0d380950a24e5d3aeda
Merge: ee5f966 b1c8ce6
Author: mindyp <mindyp@google.com>
Date:   Thu Sep 13 18:11:33 2012 -0700

    am b1c8ce62: am 939d15eb: Bump version

    * commit 'b1c8ce62dacf5b4e2ba3c8aec150c15dd88a9ca1':
      Bump version

commit 865fc7b1dd9908d40a583d7322e3414a2548bc3a
Merge: 75bbb00 ee5f966
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 13 14:19:34 2012 -0700

    am ee5f966d: am 9e97979e: am be84c68b: Use correct test for updating attachment contentUri

    * commit 'ee5f966d0a17c215316cd102088f93b53cb3908c':
      Use correct test for updating attachment contentUri

commit 60f70265973cb7373b983f3c6c76389352685976
Merge: 300bbf8 9e97979
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 13 14:13:06 2012 -0700

    am 9e97979e: am be84c68b: Use correct test for updating attachment contentUri

    * commit '9e97979ed4d1806295b5b6403b366f69c27b687f':
      Use correct test for updating attachment contentUri

commit ee5f966d0a17c215316cd102088f93b53cb3908c
Merge: 33719cf 9e97979
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 13 14:12:45 2012 -0700

    am 9e97979e: am be84c68b: Use correct test for updating attachment contentUri

    * commit '9e97979ed4d1806295b5b6403b366f69c27b687f':
      Use correct test for updating attachment contentUri

commit 2b9a37c347b393cc50c6a344862cafe6afd3358c
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 13 10:54:08 2012 -0700

    Import translations. DO NOT MERGE

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

commit 75bbb006fdbca0c39d11342ca43b2a3b06f95b8b
Merge: 68b09f1 33719cf
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 12 16:59:01 2012 -0700

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

    * commit '33719cf16d6cfd3a722d54101503551e833b7133':

commit 68b09f1ad171447ddbc2943afded4a9f000e89fd
Merge: 8a016a8 b987176
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 12 15:35:51 2012 -0700

    am b987176d: am 75705488: am a98f024b: Merge "Remove duplicate classes; trim addresses in RCPT TO:" into jb-ub-mail

    * commit 'b987176d5d0809c326a7c255efe4ad196ae71b1c':
      Remove duplicate classes; trim addresses in RCPT TO:

commit 8a016a8d7715fea7ca53ba3f23777a1a6ea635b4
Merge: 07e6c9f 88ae71f
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 12 15:35:38 2012 -0700

    am 88ae71fd: am 312ee6ae: am d14bb107: Merge "Don\'t sync at all if 1) upsync and 2) held" into jb-ub-mail

    * commit '88ae71fdeb7d4c9be9d9d7165d010fb0bf5415f4':
      Don't sync at all if 1) upsync and 2) held

commit 07e6c9f85ecbb2698bea82a18c08672b7541aa50
Merge: 05b44f6 c8e9d39
Author: mindyp <mindyp@google.com>
Date:   Wed Sep 12 15:35:21 2012 -0700

    am c8e9d39b: am 826c5d52: am 885a86c4: Fix swipe settings text

    * commit 'c8e9d39b6152917ac5c99b3261330d416624a389':
      Fix swipe settings text

commit 05b44f67429c1a61e61ac6fca975c4f2c1163515
Merge: 71d4963 a50cda9
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 12 13:18:25 2012 -0700

    am a50cda93: am e30dcd48: am a1464d13: Merge "Bump version" into jb-ub-mail

    * commit 'a50cda93c02467a8153256c213e592eb6597b47e':
      Bump version

commit 71d4963eaeef8f12d5a8fd40092409094779695d
Merge: abe4112 ba10499
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 12 13:18:23 2012 -0700

    am ba10499e: am b912df51: am f5ae8038: Merge "Make sure EmailContent is initialized" into jb-ub-mail

    * commit 'ba10499e8f19208b78263dcd01609fceeb1b2593':
      Make sure EmailContent is initialized

commit abe411203950ba52296268cc1030c1a4153b9caf
Merge: 8b31190 f312267
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 12 13:18:07 2012 -0700

    am f3122675: am 212cac68: am 85805115: Handle loadMore when no messages are loaded

    * commit 'f3122675bb5472c7a9609f53d548be16ca3ad725':
      Handle loadMore when no messages are loaded

commit 33719cf16d6cfd3a722d54101503551e833b7133
Merge: b987176 d4ed6d7
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 12 07:41:21 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I42d26b48c69eef3d9b63805707265ff2012dd7d4

commit 300bbf828693517a972579fdd53d9e9b610da930
Merge: 6545958 7570548
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 11 19:05:56 2012 -0700

    am 75705488: am a98f024b: Merge "Remove duplicate classes; trim addresses in RCPT TO:" into jb-ub-mail

    * commit '7570548840645e84d876215c5afffa9bd39a1f7b':
      Remove duplicate classes; trim addresses in RCPT TO:

commit b987176d5d0809c326a7c255efe4ad196ae71b1c
Merge: 88ae71f 7570548
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 11 19:05:47 2012 -0700

    am 75705488: am a98f024b: Merge "Remove duplicate classes; trim addresses in RCPT TO:" into jb-ub-mail

    * commit '7570548840645e84d876215c5afffa9bd39a1f7b':
      Remove duplicate classes; trim addresses in RCPT TO:

commit 88ae71fdeb7d4c9be9d9d7165d010fb0bf5415f4
Merge: c8e9d39 312ee6a
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 11 18:16:59 2012 -0700

    am 312ee6ae: am d14bb107: Merge "Don\'t sync at all if 1) upsync and 2) held" into jb-ub-mail

    * commit '312ee6aefac1cd6ede0a74464a9291cdbfca3d0f':
      Don't sync at all if 1) upsync and 2) held

commit 65459587c5aa007755eb166af0cbfe8df41c4f98
Merge: 1971047 312ee6a
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 11 18:16:16 2012 -0700

    am 312ee6ae: am d14bb107: Merge "Don\'t sync at all if 1) upsync and 2) held" into jb-ub-mail

    * commit '312ee6aefac1cd6ede0a74464a9291cdbfca3d0f':
      Don't sync at all if 1) upsync and 2) held

commit 1971047d80d8747a27a5732523dc8c359ba490cf
Merge: 81dbbd2 826c5d5
Author: mindyp <mindyp@google.com>
Date:   Tue Sep 11 17:39:32 2012 -0700

    am 826c5d52: am 885a86c4: Fix swipe settings text

    * commit '826c5d52d5e568bf4114ead6b69395ad50e4e89c':
      Fix swipe settings text

commit c8e9d39b6152917ac5c99b3261330d416624a389
Merge: a50cda9 826c5d5
Author: mindyp <mindyp@google.com>
Date:   Tue Sep 11 17:39:04 2012 -0700

    am 826c5d52: am 885a86c4: Fix swipe settings text

    * commit '826c5d52d5e568bf4114ead6b69395ad50e4e89c':
      Fix swipe settings text

commit 81dbbd2c6cd54374dad9aceee79aef037b33a8bf
Merge: e3dc0ff e30dcd4
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 11 10:20:39 2012 -0700

    am e30dcd48: am a1464d13: Merge "Bump version" into jb-ub-mail

    * commit 'e30dcd4836fec937bcd33562269e5eae3677e94b':
      Bump version

commit a50cda93c02467a8153256c213e592eb6597b47e
Merge: ba10499 e30dcd4
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 11 10:20:33 2012 -0700

    am e30dcd48: am a1464d13: Merge "Bump version" into jb-ub-mail

    * commit 'e30dcd4836fec937bcd33562269e5eae3677e94b':
      Bump version

commit e3dc0ff2f73c5ba3c5dc601e10bd65bd2b7bbc18
Merge: bfb3aee b912df5
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 11 10:17:36 2012 -0700

    am b912df51: am f5ae8038: Merge "Make sure EmailContent is initialized" into jb-ub-mail

    * commit 'b912df51728de02eda6470e7ec2e469a46b7d096':
      Make sure EmailContent is initialized

commit ba10499e8f19208b78263dcd01609fceeb1b2593
Merge: f312267 b912df5
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 11 10:17:32 2012 -0700

    am b912df51: am f5ae8038: Merge "Make sure EmailContent is initialized" into jb-ub-mail

    * commit 'b912df51728de02eda6470e7ec2e469a46b7d096':
      Make sure EmailContent is initialized

commit f3122675bb5472c7a9609f53d548be16ca3ad725
Merge: 18ea169 212cac6
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 11 09:28:17 2012 -0700

    am 212cac68: am 85805115: Handle loadMore when no messages are loaded

    * commit '212cac687e6ea179552529b1fb7aed2b5093e2c2':
      Handle loadMore when no messages are loaded

commit bfb3aeeb8256056e8c62170922c776a12acb2dca
Merge: 64cbdde 212cac6
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 11 09:27:51 2012 -0700

    am 212cac68: am 85805115: Handle loadMore when no messages are loaded

    * commit '212cac687e6ea179552529b1fb7aed2b5093e2c2':
      Handle loadMore when no messages are loaded

commit 8b3119004c2180d380ee420d36cb14897830cc20
Merge: 077ec71 18ea169
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 18:41:37 2012 -0700

    am 18ea169f: am cd382419: am a88fb327: Merge "Modify intent names" into jb-ub-mail

    * commit '18ea169f74cfaebbb88ff79edc6ed0ace74f5a75':
      Modify intent names

commit 64cbdde1929f3a81cba38e3dcc7724feca913361
Merge: 301187f cd38241
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 18:40:13 2012 -0700

    am cd382419: am a88fb327: Merge "Modify intent names" into jb-ub-mail

    * commit 'cd3824191a3065f6457745cf6f0c9003f9dbf9d2':
      Modify intent names

commit 18ea169f74cfaebbb88ff79edc6ed0ace74f5a75
Merge: 75e6673 cd38241
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 18:40:05 2012 -0700

    am cd382419: am a88fb327: Merge "Modify intent names" into jb-ub-mail

    * commit 'cd3824191a3065f6457745cf6f0c9003f9dbf9d2':
      Modify intent names

commit 077ec715b91f6404d5a2a2875dd2cd0d0b6991ce
Merge: 7023a84 75e6673
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 17:15:51 2012 -0700

    am 75e6673b: am 3500c6c7: am 6f40c2e7: Bump version

    * commit '75e6673b628202d0a0ae96246aa985870f00f0b8':
      Bump version

commit 7023a848aad3982c8271a4172095748f074889ee
Merge: 5a9f72c e29daa6
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 17:15:22 2012 -0700

    am e29daa6a: am 88fa3cb6: am 4417adce: Don\'t clear errorMap due to upload sync

    * commit 'e29daa6a3dd17c3f59cc82731a33e82d7b7949ed':
      Don't clear errorMap due to upload sync

commit 5a9f72ca13bf9bf000ba03c944eaf41297c92801
Merge: a9eca0c b7f7f9d
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 17:15:09 2012 -0700

    am b7f7f9da: am 9742518a: am d8b2b8ae: Merge "Add "System Folders" settings" into jb-ub-mail

    * commit 'b7f7f9da1544344dd5378ad3a1c7e19980f6f73d':
      Add "System Folders" settings

commit a9eca0c399baa31ef911fb439c8842f3f2458b63
Merge: 7e90dea 0f63002
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 10 17:14:13 2012 -0700

    am 0f630021: (-s ours) am cfb07ca5: am b41c9be8: (-s ours) Import translations. DO NOT MERGE

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

commit 7e90deac241bc5df7a992ca7d7c1039b5190ba72
Merge: bf36afa 60fe3db
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 10 17:14:12 2012 -0700

    am 60fe3db3: (-s ours) am a6a832f3: Import translations. DO NOT MERGE

    * commit '60fe3db3eace3efed1e937460656fdff15bbaa10':
      Import translations. DO NOT MERGE

commit bf36afad1659f8e23f7826b5299c80da46fb04f3
Merge: 21ff7f7 561a0f7
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Sep 10 17:12:51 2012 -0700

    am 561a0f70: am 32fcba18: am 5c9b9a44: increment versionCode

    * commit '561a0f70f5ba8b2f33c298869fb14a07dd4e84b0':
      increment versionCode

commit 21ff7f79170d5026e768a8fdd327bf1136ae400a
Merge: 43c5131 832df40
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 17:11:18 2012 -0700

    am 832df402: am 38bc84a1: am b621f625: Merge "Don\'t reset user\'s port number in settings" into jb-ub-mail

    * commit '832df402ce640311a86a42404e5943ea57909238':
      Don't reset user's port number in settings

commit 43c5131994aa6bdefc0b4bfbccfa3ddd4033f629
Merge: c7918ee f889f16
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 17:11:11 2012 -0700

    am f889f169: am d3f928ee: am 19e9291c: Merge "Use correct attachment provider authority" into jb-ub-mail

    * commit 'f889f169d9ad20ce4546d54b06de7b26bea4916d':
      Use correct attachment provider authority

commit c7918eee5f48ce5ddf37aff500085d175c8e1b39
Merge: 9aef6c6 4cbdc91
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 17:11:07 2012 -0700

    am 4cbdc916: am 21e7e2c6: am 393b8595: dump is @hide; remove @Override

    * commit '4cbdc916a880563808d9bae0d80791ecd35b5434':
      dump is @hide; remove @Override

commit 9aef6c63e70954001da8f5bc287dcf864049702f
Merge: 4e444db 7edb824
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 17:11:06 2012 -0700

    am 7edb8248: am 7bc7ddf8: am 323954df: Merge "Create requireSetup attribute; use it for gImap" into jb-ub-mail

    * commit '7edb8248c1228e2b34d4a6c95ff1fb0b5d7987dc':
      Create requireSetup attribute; use it for gImap

commit 4e444db1a3c06d70e85b5f49f69ae5c50719a26d
Merge: f062420 0bde7bd
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 17:11:04 2012 -0700

    am 0bde7bd9: am f7030e76: am 16b07e11: Merge "Use resource based mime type for application" into jb-ub-mail

    * commit '0bde7bd95facd54fccd2fbda97ef490c1d4af447':
      Use resource based mime type for application

commit f0624206d421083cd307c5552406f41be953dfea
Merge: cdcff3a 9db0063
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 17:10:59 2012 -0700

    am 9db0063a: am 0413dae9: am af092bd5: EmailProvider dump

    * commit '9db0063a466fb0be40909750936c814e2f3eefab':
      EmailProvider dump

commit cdcff3a72b75d2f6ee4594dca11a9572b35d0a42
Merge: f9e2e8f a11e00b
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 17:06:49 2012 -0700

    am a11e00bb: am 01779e18: am fdb16358: More work on FolderPicker

    * commit 'a11e00bb94a1742596c9a1bd51db2d6b350e6055':
      More work on FolderPicker

commit 301187fc96a3c6f175a03d1dcc3c2fa606fe094a
Merge: 4f69530 3500c6c
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 14:09:33 2012 -0700

    am 3500c6c7: am 6f40c2e7: Bump version

    * commit '3500c6c70964d773130fceef2b717c6f09ff24c2':
      Bump version

commit 75e6673b628202d0a0ae96246aa985870f00f0b8
Merge: e29daa6 3500c6c
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 14:08:57 2012 -0700

    am 3500c6c7: am 6f40c2e7: Bump version

    * commit '3500c6c70964d773130fceef2b717c6f09ff24c2':
      Bump version

commit e29daa6a3dd17c3f59cc82731a33e82d7b7949ed
Merge: b7f7f9d 88fa3cb
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 12:50:46 2012 -0700

    am 88fa3cb6: am 4417adce: Don\'t clear errorMap due to upload sync

    * commit '88fa3cb6ba63211dc4594b690cc32b64af9930be':
      Don't clear errorMap due to upload sync

commit 4f695304a003519c8c19cf5527415fddffc57d64
Merge: 5ccb542 88fa3cb
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 12:50:03 2012 -0700

    am 88fa3cb6: am 4417adce: Don\'t clear errorMap due to upload sync

    * commit '88fa3cb6ba63211dc4594b690cc32b64af9930be':
      Don't clear errorMap due to upload sync

commit b7f7f9da1544344dd5378ad3a1c7e19980f6f73d
Merge: 0f63002 9742518
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 11:55:00 2012 -0700

    am 9742518a: am d8b2b8ae: Merge "Add "System Folders" settings" into jb-ub-mail

    * commit '9742518ac39206b5f88ecbeb951e55723cb3a7ba':
      Add "System Folders" settings

commit 5ccb542aafb2b473d20153a21068fd1b702d74bf
Merge: aac8552 9742518
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 11:54:29 2012 -0700

    am 9742518a: am d8b2b8ae: Merge "Add "System Folders" settings" into jb-ub-mail

    * commit '9742518ac39206b5f88ecbeb951e55723cb3a7ba':
      Add "System Folders" settings

commit aac85528184ac7c088379594e6dcc4eb7cb35ef1
Merge: 507b0c0 cfb07ca
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 10 10:12:15 2012 -0700

    am cfb07ca5: (-s ours) am b41c9be8: (-s ours) Import translations. DO NOT MERGE

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

commit 0f6300215bc99c97c885ac57d311052899820fae
Merge: 60fe3db cfb07ca
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 10 10:11:41 2012 -0700

    am cfb07ca5: am b41c9be8: (-s ours) Import translations. DO NOT MERGE

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

commit 60fe3db3eace3efed1e937460656fdff15bbaa10
Merge: 561a0f7 a6a832f
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 10 10:11:38 2012 -0700

    am a6a832f3: Import translations. DO NOT MERGE

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

commit 507b0c039db5ef0f13514b91723302707d594fe9
Merge: 6bfe188 a6a832f
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 10 10:10:44 2012 -0700

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

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

commit f9e2e8f99469d085b06ac7ca801f3bd762643b35
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 10 08:54:45 2012 -0700

    Import translations. DO NOT MERGE

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

commit 6bfe188ada126fcfe806f340f2bf76cd14c62869
Merge: 09fcaad 32fcba1
Author: Paul Westbrook <pwestbro@google.com>
Date:   Sun Sep 9 18:46:17 2012 -0700

    am 32fcba18: am 5c9b9a44: increment versionCode

    * commit '32fcba18477f33eaa5ca9d6f384a2ea6f8ea6ef6':
      increment versionCode

commit 561a0f70f5ba8b2f33c298869fb14a07dd4e84b0
Merge: 832df40 32fcba1
Author: Paul Westbrook <pwestbro@google.com>
Date:   Sun Sep 9 18:46:06 2012 -0700

    am 32fcba18: am 5c9b9a44: increment versionCode

    * commit '32fcba18477f33eaa5ca9d6f384a2ea6f8ea6ef6':
      increment versionCode

commit 09fcaadd4c5535d24cfbc427b1e40defea8d1c42
Merge: 25bfcf0 38bc84a
Author: Marc Blank <mblank@google.com>
Date:   Sun Sep 9 10:55:17 2012 -0700

    am 38bc84a1: am b621f625: Merge "Don\'t reset user\'s port number in settings" into jb-ub-mail

    * commit '38bc84a105e9541841fe5875399dcbf5c08b60c4':
      Don't reset user's port number in settings

commit 832df402ce640311a86a42404e5943ea57909238
Merge: f889f16 38bc84a
Author: Marc Blank <mblank@google.com>
Date:   Sun Sep 9 10:55:06 2012 -0700

    am 38bc84a1: am b621f625: Merge "Don\'t reset user\'s port number in settings" into jb-ub-mail

    * commit '38bc84a105e9541841fe5875399dcbf5c08b60c4':
      Don't reset user's port number in settings

commit 25bfcf0d0ddbb324206fbd676a6e34394e78e2e8
Merge: 3a23ba2 d3f928e
Author: Marc Blank <mblank@google.com>
Date:   Sun Sep 9 10:49:48 2012 -0700

    am d3f928ee: am 19e9291c: Merge "Use correct attachment provider authority" into jb-ub-mail

    * commit 'd3f928eee98664889ad4ac3491a6ae8f9968e073':
      Use correct attachment provider authority

commit f889f169d9ad20ce4546d54b06de7b26bea4916d
Merge: 4cbdc91 d3f928e
Author: Marc Blank <mblank@google.com>
Date:   Sun Sep 9 10:49:43 2012 -0700

    am d3f928ee: am 19e9291c: Merge "Use correct attachment provider authority" into jb-ub-mail

    * commit 'd3f928eee98664889ad4ac3491a6ae8f9968e073':
      Use correct attachment provider authority

commit 3a23ba2daad83138ad549bd0d8efe586711f2902
Merge: c60188d 21e7e2c
Author: Marc Blank <mblank@google.com>
Date:   Sun Sep 9 10:23:05 2012 -0700

    am 21e7e2c6: am 393b8595: dump is @hide; remove @Override

    * commit '21e7e2c626eb9de890ba724f6084adb565f73f65':
      dump is @hide; remove @Override

commit 4cbdc916a880563808d9bae0d80791ecd35b5434
Merge: 7edb824 21e7e2c
Author: Marc Blank <mblank@google.com>
Date:   Sun Sep 9 10:22:55 2012 -0700

    am 21e7e2c6: am 393b8595: dump is @hide; remove @Override

    * commit '21e7e2c626eb9de890ba724f6084adb565f73f65':
      dump is @hide; remove @Override

commit 7edb8248c1228e2b34d4a6c95ff1fb0b5d7987dc
Merge: 0bde7bd 7bc7ddf
Author: Marc Blank <mblank@google.com>
Date:   Sun Sep 9 10:19:19 2012 -0700

    am 7bc7ddf8: am 323954df: Merge "Create requireSetup attribute; use it for gImap" into jb-ub-mail

    * commit '7bc7ddf89146b6cdf13d76ec7ce06115c8646d8f':
      Create requireSetup attribute; use it for gImap

commit 0bde7bd95facd54fccd2fbda97ef490c1d4af447
Merge: 9db0063 f7030e7
Author: Marc Blank <mblank@google.com>
Date:   Sun Sep 9 10:19:17 2012 -0700

    am f7030e76: am 16b07e11: Merge "Use resource based mime type for application" into jb-ub-mail

    * commit 'f7030e76f647260b5010551ec18d11d507525d8a':
      Use resource based mime type for application

commit c60188d1e572e63138bd5f036fb6b5f63d54d5c4
Merge: 74968c1 7bc7ddf
Author: Marc Blank <mblank@google.com>
Date:   Sun Sep 9 10:18:30 2012 -0700

    am 7bc7ddf8: am 323954df: Merge "Create requireSetup attribute; use it for gImap" into jb-ub-mail

    * commit '7bc7ddf89146b6cdf13d76ec7ce06115c8646d8f':
      Create requireSetup attribute; use it for gImap

commit 74968c19094082a3d0d5605853743ced4e0d90b9
Merge: 73c1253 f7030e7
Author: Marc Blank <mblank@google.com>
Date:   Sun Sep 9 10:18:29 2012 -0700

    am f7030e76: am 16b07e11: Merge "Use resource based mime type for application" into jb-ub-mail

    * commit 'f7030e76f647260b5010551ec18d11d507525d8a':
      Use resource based mime type for application

commit 9db0063a466fb0be40909750936c814e2f3eefab
Merge: a11e00b 0413dae
Author: Marc Blank <mblank@google.com>
Date:   Sun Sep 9 10:17:49 2012 -0700

    am 0413dae9: am af092bd5: EmailProvider dump

    * commit '0413dae9a9baf6b9d3b5eb2a5e3c2d4464382ac3':
      EmailProvider dump

commit 73c12539d73bdcd94e2e3142de1993b3c85dc8ea
Merge: 1fdba6e 0413dae
Author: Marc Blank <mblank@google.com>
Date:   Sun Sep 9 10:16:57 2012 -0700

    am 0413dae9: am af092bd5: EmailProvider dump

    * commit '0413dae9a9baf6b9d3b5eb2a5e3c2d4464382ac3':
      EmailProvider dump

commit 1fdba6e84d883da0572b66aac73ed27e5704b1b7
Merge: 62db732 01779e1
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 7 16:43:02 2012 -0700

    am 01779e18: am fdb16358: More work on FolderPicker

    * commit '01779e18915cec6ee223e4bc1d950e2a4e2530ec':
      More work on FolderPicker

commit 62db732ad3d2385fe210aebb09e3cef3376610eb
Merge: cffcea0 ba85cd6
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 7 16:41:11 2012 -0700

    am ba85cd68: am 8c8a68a7: Prevent looping w/ exceptions during IDLE

    * commit 'ba85cd68e469774531049107b13db76f751e404b':
      Prevent looping w/ exceptions during IDLE

commit a11e00bb94a1742596c9a1bd51db2d6b350e6055
Merge: ea06a09 01779e1
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 7 14:44:11 2012 -0700

    am 01779e18: am fdb16358: More work on FolderPicker

    * commit '01779e18915cec6ee223e4bc1d950e2a4e2530ec':
      More work on FolderPicker

commit 607524559969b1d09b43fc539356eaffc0d11470
Merge: ba5604d ea06a09
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 7 13:48:36 2012 -0700

    am ea06a09a: am ba85cd68: am 8c8a68a7: Prevent looping w/ exceptions during IDLE

    * commit 'ea06a09a8862c68168967a6c80ca39a02efdc93e':
      Prevent looping w/ exceptions during IDLE

commit cffcea073e9b797471298271749bbd8aaa8c25fb
Merge: 5463532 c9ce90a
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 7 13:45:17 2012 -0700

    am c9ce90a1: am dc1655bc: Bump version

    * commit 'c9ce90a17b9aa1a573e0f8deb57dfa7e2a170706':
      Bump version

commit 546353256e4f8131352da7fe60ed670ffbc6947d
Merge: 72a69eb 7b53e9c
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 7 13:44:54 2012 -0700

    am 7b53e9c7: am 9a341d85: Merge "Improve trash folder picker upon account creation" into jb-ub-mail

    * commit '7b53e9c7aa4e4085aa88529648d09943daa438ac':
      Improve trash folder picker upon account creation

commit 72a69eb451c9334d33975d94059c82604b07c183
Merge: c09afb0 512b1e3
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 7 13:44:20 2012 -0700

    am 512b1e31: am 14e5f567: Merge "Log capabilities (w/ STOPSHIP)" into jb-ub-mail

    * commit '512b1e31a33050700b166cda793cd5a6b32edfe8':
      Log capabilities (w/ STOPSHIP)

commit c09afb073f4ef9f827bc89da62c3bb29ff0886ec
Merge: 17b609f 8c4046a
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 7 13:43:35 2012 -0700

    am 8c4046a7: am 2f589758: Merge "Clean up imap2 logging" into jb-ub-mail

    * commit '8c4046a753d3c4196b0eebbb767b063d6bcc0323':
      Clean up imap2 logging

commit 17b609fa274002388e13e1c71cc53e7571e25053
Merge: 08b0531 1b864c8
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 7 13:43:20 2012 -0700

    am 1b864c83: (-s ours) am 05fdc7de: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '1b864c83693e35124515ccf26822f6481ecd7764':
      Import translations. DO NOT MERGE

commit 08b0531c6407ae829982f57cb403a36af347ac3c
Merge: ec4ae8d 43736e3
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 7 13:43:18 2012 -0700

    am 43736e33: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '43736e3312913447519d14a4edc679beae5c32aa':
      Import translations. DO NOT MERGE

commit ec4ae8d3615dd8523f3a21e764a2fc8c5ffd70a9
Merge: 8d03ffc d0c2d8c
Author: Mark Wei <markwei@google.com>
Date:   Fri Sep 7 13:42:29 2012 -0700

    am d0c2d8c8: am 3487ae89: Merge "Add supplementary account info to outbound google.com links" into jb-ub-mail

    * commit 'd0c2d8c80fd79c95b855f20e27d7aba857ed41d2':
      Add supplementary account info to outbound google.com links

commit 8d03ffc1f7d92f794a1105234bd9a99caaf886bf
Merge: b8680dc cbaecbc
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Sep 7 13:41:10 2012 -0700

    am cbaecbcd: (-s ours) am 1b2210b6: (-s ours) Reconcile with jb-release - do not merge

    * commit 'cbaecbcdc6fe019180a89dc102eb2bdc6eb07222':

commit ea06a09a8862c68168967a6c80ca39a02efdc93e
Merge: 85412c3 ba85cd6
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 7 09:14:13 2012 -0700

    am ba85cd68: am 8c8a68a7: Prevent looping w/ exceptions during IDLE

    * commit 'ba85cd68e469774531049107b13db76f751e404b':
      Prevent looping w/ exceptions during IDLE

commit ba5604d2872e3a3c53a4e2a47cd6a90f24228d07
Merge: 3721178 85412c3
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 6 18:24:12 2012 -0700

    am 85412c32: am c9ce90a1: am dc1655bc: Bump version

    * commit '85412c3229177ee586c046f6329c5c7d22985221':
      Bump version

commit 85412c3229177ee586c046f6329c5c7d22985221
Merge: 2e56b7d c9ce90a
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 6 18:22:50 2012 -0700

    am c9ce90a1: am dc1655bc: Bump version

    * commit 'c9ce90a17b9aa1a573e0f8deb57dfa7e2a170706':
      Bump version

commit 3721178e691279d7baa64f5dbb8e099aa5e05222
Merge: f55c899 2e56b7d
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 6 17:54:49 2012 -0700

    am 2e56b7d7: am 7b53e9c7: am 9a341d85: Merge "Improve trash folder picker upon account creation" into jb-ub-mail

    * commit '2e56b7d797ca6c1a02ecad2add6036b49886d433':
      Improve trash folder picker upon account creation

commit 2e56b7d797ca6c1a02ecad2add6036b49886d433
Merge: ed1573f 7b53e9c
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 6 17:53:08 2012 -0700

    am 7b53e9c7: am 9a341d85: Merge "Improve trash folder picker upon account creation" into jb-ub-mail

    * commit '7b53e9c7aa4e4085aa88529648d09943daa438ac':
      Improve trash folder picker upon account creation

commit f55c899b51ecf376781587f4f8cdf568b4d5109e
Merge: 5b01590 ed1573f
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 6 16:07:56 2012 -0700

    am ed1573f2: am 512b1e31: am 14e5f567: Merge "Log capabilities (w/ STOPSHIP)" into jb-ub-mail

    * commit 'ed1573f2eee9a6da149d2f9f95a1e181737aff07':
      Log capabilities (w/ STOPSHIP)

commit ed1573f2eee9a6da149d2f9f95a1e181737aff07
Merge: ec69fd5 512b1e3
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 6 16:06:24 2012 -0700

    am 512b1e31: am 14e5f567: Merge "Log capabilities (w/ STOPSHIP)" into jb-ub-mail

    * commit '512b1e31a33050700b166cda793cd5a6b32edfe8':
      Log capabilities (w/ STOPSHIP)

commit 5b015908e5683a28dcd768e432513892f1072937
Merge: 5dbadf8 ec69fd5
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 6 14:32:36 2012 -0700

    am ec69fd54: am 8c4046a7: am 2f589758: Merge "Clean up imap2 logging" into jb-ub-mail

    * commit 'ec69fd54d0690e3cf6f97da8db2a1395806b4822':
      Clean up imap2 logging

commit ec69fd54d0690e3cf6f97da8db2a1395806b4822
Merge: 682e0d0 8c4046a
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 6 14:31:21 2012 -0700

    am 8c4046a7: am 2f589758: Merge "Clean up imap2 logging" into jb-ub-mail

    * commit '8c4046a753d3c4196b0eebbb767b063d6bcc0323':
      Clean up imap2 logging

commit 5dbadf8002e40263eab2cc1a1b5ed0df67c5eab0
Merge: 6ed18a2 682e0d0
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 6 14:06:29 2012 -0700

    am 682e0d02: (-s ours) am 1b864c83: am 05fdc7de: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '682e0d02223770a711c0592256f76e9f78c86951':
      Import translations. DO NOT MERGE

commit 6ed18a2e1be2ded6c61d3a2ce11a2193ba586ba0
Merge: 8ee7c1e f891f7b
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 6 14:06:27 2012 -0700

    am f891f7b5: (-s ours) am 43736e33: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

commit 682e0d02223770a711c0592256f76e9f78c86951
Merge: f891f7b 1b864c8
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 6 14:04:46 2012 -0700

    am 1b864c83: am 05fdc7de: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '1b864c83693e35124515ccf26822f6481ecd7764':
      Import translations. DO NOT MERGE

commit f891f7b500f31d5c556179f00eb24d2384907e34
Merge: 08951ef 43736e3
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 6 14:04:45 2012 -0700

    am 43736e33: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '43736e3312913447519d14a4edc679beae5c32aa':
      Import translations. DO NOT MERGE

commit 8ee7c1e2bdd7333d96ce8a726be4df69bebbb791
Merge: 966b66f 7dfa2f6
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 6 14:02:27 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit 966b66fc44f101ee2699578b791de83b36596fee
Merge: 6b1b686 08951ef
Author: Mark Wei <markwei@google.com>
Date:   Thu Sep 6 11:54:47 2012 -0700

    am 08951ef6: am d0c2d8c8: am 3487ae89: Merge "Add supplementary account info to outbound google.com links" into jb-ub-mail

    * commit '08951ef6d2003e2927b643dcef0f4b64835a10dc':
      Add supplementary account info to outbound google.com links

commit 08951ef6d2003e2927b643dcef0f4b64835a10dc
Merge: d345fcb d0c2d8c
Author: Mark Wei <markwei@google.com>
Date:   Thu Sep 6 11:52:23 2012 -0700

    am d0c2d8c8: am 3487ae89: Merge "Add supplementary account info to outbound google.com links" into jb-ub-mail

    * commit 'd0c2d8c80fd79c95b855f20e27d7aba857ed41d2':
      Add supplementary account info to outbound google.com links

commit 6b1b6862f1114420313103b53a1becef9fe93403
Merge: 6cf0c54 d345fcb
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 6 09:19:36 2012 -0700

    am d345fcb1: (-s ours) am cbaecbcd: am 1b2210b6: (-s ours) Reconcile with jb-release - do not merge

    * commit 'd345fcb18b04c77c38979f99e25845bcb3ff6ad1':

commit d345fcb18b04c77c38979f99e25845bcb3ff6ad1
Merge: 9aa5319 cbaecbc
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 6 09:15:49 2012 -0700

    am cbaecbcd: am 1b2210b6: (-s ours) Reconcile with jb-release - do not merge

    * commit 'cbaecbcdc6fe019180a89dc102eb2bdc6eb07222':

commit 6cf0c545aa0e7507109ea5b6b1623b522607e308
Merge: 9600a8d 9aa5319
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 6 09:12:20 2012 -0700

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

    * commit '9aa5319f300f806da7087f6bca8d3b9fc8e2c2eb':

commit 9aa5319f300f806da7087f6bca8d3b9fc8e2c2eb
Merge: d5d8df0 7ba9a40
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 6 07:54:27 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: If16c0b6d388a56c6b7cdb378424636236080a52c

commit 9600a8dd13a237e92d5538ca5d62ed779af9ec02
Merge: 3842863 d5d8df0
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 5 14:12:26 2012 -0700

    am d5d8df0f: am b8680dc3: am a2c28649: Bump version

    * commit 'd5d8df0f9e1d7bdba8dff19e87e8e525780db429':
      Bump version

commit d5d8df0f9e1d7bdba8dff19e87e8e525780db429
Merge: ddd787d b8680dc
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 5 14:10:06 2012 -0700

    am b8680dc3: am a2c28649: Bump version

    * commit 'b8680dc3af347831a3457b413c7679ea29629c26':
      Bump version

commit 3842863f098ddf9dd083400c4c428a2f28a15326
Merge: 8e7f2f8 ddd787d
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 5 13:47:35 2012 -0700

    am ddd787d8: am 8d8ae029: am b210f3ad: Merge "Revert "Initialize mDatabase on provider startup"" into jb-ub-mail

    * commit 'ddd787d8036a89a5fec042bc8d19871265253819':
      Revert "Initialize mDatabase on provider startup"

commit ddd787d8036a89a5fec042bc8d19871265253819
Merge: d3c17d5 8d8ae02
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 5 13:45:03 2012 -0700

    am 8d8ae029: am b210f3ad: Merge "Revert "Initialize mDatabase on provider startup"" into jb-ub-mail

    * commit '8d8ae0290f72f84bab01d74c0b548c445684204e':
      Revert "Initialize mDatabase on provider startup"

commit 8e7f2f80d75e39ec8d67e56a0ab7f86ba6270d31
Merge: 048de50 d3c17d5
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 5 13:18:58 2012 -0700

    am d3c17d5c: am f41d00b4: am c0e2b147: Clear visibleLimit when folder entered

    * commit 'd3c17d5c90e3fc36928ba755fc21ebf0981bb3be':
      Clear visibleLimit when folder entered

commit d3c17d5c90e3fc36928ba755fc21ebf0981bb3be
Merge: 7978f5a f41d00b
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 5 13:16:42 2012 -0700

    am f41d00b4: am c0e2b147: Clear visibleLimit when folder entered

    * commit 'f41d00b4e847168ae95cc5b35954165ea8fa6545':
      Clear visibleLimit when folder entered

commit 048de5090c88e0afb0dc898ec3cda1cf4373f48a
Merge: 39fbe58 7978f5a
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 5 11:08:29 2012 -0700

    am 7978f5a6: am d0619890: am d2bf25ac: Make sure body loading finishes when searching

    * commit '7978f5a621fce77de1c62cbcfc8ece52efffd22d':
      Make sure body loading finishes when searching

commit 7978f5a621fce77de1c62cbcfc8ece52efffd22d
Merge: 70870a4 d061989
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 5 11:06:18 2012 -0700

    am d0619890: am d2bf25ac: Make sure body loading finishes when searching

    * commit 'd0619890183b57a372484e7a6302cb485f88bef0':
      Make sure body loading finishes when searching

commit 7dfa2f6678334ec32892502374eefa9a2c1ee73c
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Sep 5 10:34:45 2012 -0700

    Import translations. DO NOT MERGE

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

commit 39fbe58416bda3e38eff3503137754e0772b2be5
Merge: 3469ed4 70870a4
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 5 10:03:59 2012 -0700

    am 70870a4f: am 8d51344a: am 7110183f: Merge "Put combined account last" into jb-ub-mail

    * commit '70870a4fed21bbe44170606305e50c6f867e24f5':
      Put combined account last

commit 70870a4fed21bbe44170606305e50c6f867e24f5
Merge: 16b7567 8d51344
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 5 10:02:12 2012 -0700

    am 8d51344a: am 7110183f: Merge "Put combined account last" into jb-ub-mail

    * commit '8d51344aaa14dafb2b7ab2d5e0de8bce97f839fc':
      Put combined account last

commit 3469ed43e4c6c1f34ac39aa245a6d4b562f999c0
Merge: 42d648c 16b7567
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 4 20:23:05 2012 -0700

    am 16b7567d: am a0f276f8: am db1c8452: Handle mime encoded sender in convo list

    * commit '16b7567d6a2b17f2ea37a6b00d41e2a3542e4f0e':
      Handle mime encoded sender in convo list

commit 16b7567d6a2b17f2ea37a6b00d41e2a3542e4f0e
Merge: d95b654 a0f276f
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 4 20:21:13 2012 -0700

    am a0f276f8: am db1c8452: Handle mime encoded sender in convo list

    * commit 'a0f276f84927abe831836448373746b13333c288':
      Handle mime encoded sender in convo list

commit 42d648c7852c66337d14f2cbfa785ce14b3980b9
Merge: 84339db d95b654
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Sep 4 14:37:08 2012 -0700

    am d95b654d: am bb3a39ab: am 31f53df3: (-s ours) am 8e66b6fe: Merge "Make ImapFolder locale safe"

    * commit 'd95b654defdc749b0c9c1ff579a6dd3af26d5a93':
      Make ImapFolder locale safe

commit d95b654defdc749b0c9c1ff579a6dd3af26d5a93
Merge: 1ac0a99 bb3a39a
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Sep 4 14:35:39 2012 -0700

    am bb3a39ab: am 31f53df3: (-s ours) am 8e66b6fe: Merge "Make ImapFolder locale safe"

    * commit 'bb3a39abc535e80f02d82a30854b73fdd654df8d':
      Make ImapFolder locale safe

commit 84339db2da537bef3ef682b7f0dac849d8556312
Merge: 4f8bb46 1ac0a99
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Sep 4 14:19:16 2012 -0700

    am 1ac0a991: am e41172e1: resolved conflicts for merge of 68e66351 to jb-mr1-dev

    * commit '1ac0a9917e593e985cd261b9b3ec15ad2338c874':
      Make Pop3Store locale safe

commit 1ac0a9917e593e985cd261b9b3ec15ad2338c874
Merge: 8a2ded0 e41172e
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Sep 4 14:16:34 2012 -0700

    am e41172e1: resolved conflicts for merge of 68e66351 to jb-mr1-dev

    * commit 'e41172e1974aaef40c80bfb9d3340e3e82ef067e':
      Make Pop3Store locale safe

commit 4f8bb46660c86e486b1db22a3e414f021fbb548d
Merge: 9b5beec 8a2ded0
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Sep 4 12:01:47 2012 -0700

    am 8a2ded05: (-s ours) am 0ccfd8f7: am 2c250860: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

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

commit 9b5beecef5d63435a664ba5f7780fd0235976837
Merge: a12ffa3 1b4331e
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Sep 4 12:01:46 2012 -0700

    am 1b4331e2: (-s ours) am ce1bd999: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '1b4331e2dee2c08f095437196224b4d7d4145b90':
      Import translations. DO NOT MERGE

commit 8a2ded05990998df97ed76d10824889c2d2e6cc7
Merge: 1b4331e 0ccfd8f
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Sep 4 12:00:54 2012 -0700

    am 0ccfd8f7: am 2c250860: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

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

commit 1b4331e2dee2c08f095437196224b4d7d4145b90
Merge: 909bf8d ce1bd99
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Sep 4 11:59:26 2012 -0700

    am ce1bd999: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

commit a12ffa3b039fc05b22c4b1645d27360fb7cd596b
Merge: 46b2575 14c74fd
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Sep 4 11:56:40 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit 46b25756770945896300a12f4716de5c0d82b970
Merge: 7a1a32a 909bf8d
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 4 09:01:51 2012 -0700

    am 909bf8d0: am a6d34de6: am 9765f7b2: Merge "Initialize mDatabase on provider startup" into jb-ub-mail

    * commit '909bf8d0bcbc379ad0cfa3def71b2b779f88ed4a':
      Initialize mDatabase on provider startup

commit 909bf8d0bcbc379ad0cfa3def71b2b779f88ed4a
Merge: 7d3323b a6d34de
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 4 08:59:35 2012 -0700

    am a6d34de6: am 9765f7b2: Merge "Initialize mDatabase on provider startup" into jb-ub-mail

    * commit 'a6d34de6015837b834273a231a42bc917a554acd':
      Initialize mDatabase on provider startup

commit 7a1a32aed88d6f072142698ad857af020cf5f808
Merge: a01169d 7d3323b
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 4 08:29:13 2012 -0700

    am 7d3323b6: am c8699108: am 5a2b9579: Prevent possible NPE

    * commit '7d3323b646e437bcd8dda7034c0a54925619b82c':
      Prevent possible NPE

commit 7d3323b646e437bcd8dda7034c0a54925619b82c
Merge: 31b7848 c869910
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 4 08:26:48 2012 -0700

    am c8699108: am 5a2b9579: Prevent possible NPE

    * commit 'c8699108934b346f2df2563247aee1f201cb54a3':
      Prevent possible NPE

commit a01169d8dcc87e0f8feb764e09fcabb073cea9ea
Merge: 2715d41 31b7848
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 3 19:01:45 2012 -0700

    am 31b78483: am 3348d6da: am 9e4556ae: Merge "Revert "Initialize mDatabase on provider startup"" into jb-ub-mail

    * commit '31b78483473ce05a0536929fdc573636c1178eec':
      Revert "Initialize mDatabase on provider startup"

commit 31b78483473ce05a0536929fdc573636c1178eec
Merge: 0051f90 3348d6d
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 3 18:59:37 2012 -0700

    am 3348d6da: am 9e4556ae: Merge "Revert "Initialize mDatabase on provider startup"" into jb-ub-mail

    * commit '3348d6da67f07064dc22da74a8677906dec78f8f':
      Revert "Initialize mDatabase on provider startup"

commit 2715d41b7c88dfb185426c5331a96d7b7eac738e
Merge: cbd2fb0 0051f90
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 3 18:52:57 2012 -0700

    am 0051f905: am 941e1c74: am 5bf0cef2: Merge "Show "Creating account..." dialog during account creation" into jb-ub-mail

    * commit '0051f905f3ff2af59e88970337c935ac72718f6b':
      Show "Creating account..." dialog during account creation

commit 0051f905f3ff2af59e88970337c935ac72718f6b
Merge: cffe559 941e1c7
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 3 18:50:49 2012 -0700

    am 941e1c74: am 5bf0cef2: Merge "Show "Creating account..." dialog during account creation" into jb-ub-mail

    * commit '941e1c74fbd8c5ec0eba185c2035d52717f3f2d9':
      Show "Creating account..." dialog during account creation

commit cbd2fb03f9ef1947847ba6c073675d8051a9fbf3
Merge: d055203 cffe559
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 3 18:42:04 2012 -0700

    am cffe559b: am 156bf908: am efb46b08: Merge "Clear visible limit when  entering mailbox; enable imap load more" into jb-ub-mail

    * commit 'cffe559b372b2ec0f6771ef2515c6ef3d4b2e3fd':
      Clear visible limit when  entering mailbox; enable imap load more

commit d0552031b4ec0f259294892c16b1e78b4429279c
Merge: 54fcc20 134396e
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 3 18:42:03 2012 -0700

    am 134396ed: am fa543af3: am 644f172c: Merge "Initialize mDatabase on provider startup" into jb-ub-mail

    * commit '134396edb294cab5a1fce66b3c1dbc78c1e0b547':
      Initialize mDatabase on provider startup

commit 54fcc202b446ae331ab30e2c0ba069a1ae7b2ccf
Merge: 922b9aa e4f130c
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 3 18:42:01 2012 -0700

    am e4f130c2: am 88505b81: am b82437f5: Merge "Allow NULL values in genSelect" into jb-ub-mail

    * commit 'e4f130c2b3f2ba48592faa2ce42465d4073661ce':
      Allow NULL values in genSelect

commit 922b9aa4a9cea8ece143845d8c7c2222dcf8a2fa
Merge: 3f33326 8bc9362
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 3 18:40:32 2012 -0700

    am 8bc9362b: am d490f876: am 0ef02e57: Merge "Decode base64 message text" into jb-ub-mail

    * commit '8bc9362bc124de7b3b20c5f7ede3fb7504f703e5':
      Decode base64 message text

commit cffe559b372b2ec0f6771ef2515c6ef3d4b2e3fd
Merge: 134396e 156bf90
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 3 18:39:35 2012 -0700

    am 156bf908: am efb46b08: Merge "Clear visible limit when  entering mailbox; enable imap load more" into jb-ub-mail

    * commit '156bf908ca9cd1505cefe71c13a322669feeffbd':
      Clear visible limit when  entering mailbox; enable imap load more

commit 134396edb294cab5a1fce66b3c1dbc78c1e0b547
Merge: e4f130c fa543af
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 3 18:39:34 2012 -0700

    am fa543af3: am 644f172c: Merge "Initialize mDatabase on provider startup" into jb-ub-mail

    * commit 'fa543af380da66536e1c9070abd55030c82bada5':
      Initialize mDatabase on provider startup

commit e4f130c2b3f2ba48592faa2ce42465d4073661ce
Merge: 8bc9362 88505b8
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 3 18:39:33 2012 -0700

    am 88505b81: am b82437f5: Merge "Allow NULL values in genSelect" into jb-ub-mail

    * commit '88505b81d0fa935988fc8c247a96c543b47ef4f3':
      Allow NULL values in genSelect

commit 3f33326244c3eab50934c6bd0c73f9adb98a4288
Merge: ef08a27 02534ed
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 3 18:38:57 2012 -0700

    am 02534ede: am 7a0d86cb: am 75909076: Merge "Fix Imap mail sending" into jb-ub-mail

    * commit '02534edea35bd61b453c1b896ec3f8743125c428':
      Fix Imap mail sending

commit ef08a2710ccadf9594046f7103ac41c827d1a97b
Merge: 77f70a7 b1fc991
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 3 18:38:55 2012 -0700

    am b1fc9910: am 77401dc7: am ada7dfef: Merge "Reconcile all types of local accounts in MailService" into jb-ub-mail

    * commit 'b1fc991076700feac1641fa4639a58665cbb3423':
      Reconcile all types of local accounts in MailService

commit 8bc9362bc124de7b3b20c5f7ede3fb7504f703e5
Merge: 02534ed d490f87
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 3 18:38:06 2012 -0700

    am d490f876: am 0ef02e57: Merge "Decode base64 message text" into jb-ub-mail

    * commit 'd490f87697ebfd159e7eecee9b480755d3f2709b':
      Decode base64 message text

commit 02534edea35bd61b453c1b896ec3f8743125c428
Merge: b1fc991 7a0d86c
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 3 18:36:27 2012 -0700

    am 7a0d86cb: am 75909076: Merge "Fix Imap mail sending" into jb-ub-mail

    * commit '7a0d86cbd4435239f340292d8f42a571b54ebe78':
      Fix Imap mail sending

commit b1fc991076700feac1641fa4639a58665cbb3423
Merge: 55c127f 77401dc
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 3 18:36:26 2012 -0700

    am 77401dc7: am ada7dfef: Merge "Reconcile all types of local accounts in MailService" into jb-ub-mail

    * commit '77401dc7b7eae926123f7dd8a999e60b2472dfe2':
      Reconcile all types of local accounts in MailService

commit 77f70a7cef3b84ca25ddee61a0665d604f863d06
Merge: 5b46da5 55c127f
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 3 11:57:26 2012 -0700

    am 55c127f0: am 8e104063: am 96e13d4d: Don\'t logout of Imap while body loading continues

    * commit '55c127f0bcbdd6c1d967534705ca6fc0b54397f4':
      Don't logout of Imap while body loading continues

commit 55c127f0bcbdd6c1d967534705ca6fc0b54397f4
Merge: 39692e1 8e10406
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 3 11:55:53 2012 -0700

    am 8e104063: am 96e13d4d: Don\'t logout of Imap while body loading continues

    * commit '8e104063da394d9eb507848a30af5e6d5d83a1df':
      Don't logout of Imap while body loading continues

commit 5b46da5d955e659963c51fd2b4abea04d910fb41
Merge: fc6045e 39692e1
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 1 16:40:28 2012 -0700

    am 39692e14: am 8116f576: am b82ae909: Add support for "load more" for Imap2

    * commit '39692e1472494fa34efc65d1ca0d77ff77d1bb46':
      Add support for "load more" for Imap2

commit 39692e1472494fa34efc65d1ca0d77ff77d1bb46
Merge: e601642 8116f57
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 1 16:38:15 2012 -0700

    am 8116f576: am b82ae909: Add support for "load more" for Imap2

    * commit '8116f576eb9ce8112f815f073fab4809e83423ed':
      Add support for "load more" for Imap2

commit fc6045eece612416798244b4fbde9ddd4bece3b5
Merge: c196d93 e601642
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 1 15:59:52 2012 -0700

    am e601642a: am e0b8fd27: am e714bb9d: Convert authorities, intents, and account manager types

    * commit 'e601642a9a09d891cb0e49f20661d47d7af06719':
      Convert authorities, intents, and account manager types

commit e601642a9a09d891cb0e49f20661d47d7af06719
Merge: 3204933 e0b8fd2
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 1 15:57:49 2012 -0700

    am e0b8fd27: am e714bb9d: Convert authorities, intents, and account manager types

    * commit 'e0b8fd27ac7bb273c6622f26c9aca57fc467236a':
      Convert authorities, intents, and account manager types

commit 14c74fdcb2b2eb14a28fcc90ac3c131721aa118f
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Aug 31 07:52:29 2012 -0700

    Import translations. DO NOT MERGE

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

commit c196d936383e1a5baf5813e6a86e69ba4ed27684
Merge: a296201 3204933
Author: Marc Blank <mblank@google.com>
Date:   Wed Aug 29 15:22:29 2012 -0700

    am 32049333: am ae678bac: am 5ac8d387: Always return correct folder capabilities

    * commit '32049333bbfbecbb1d4814754a6f3d37d7722e21':
      Always return correct folder capabilities

commit 32049333bbfbecbb1d4814754a6f3d37d7722e21
Merge: ae60325 ae678ba
Author: Marc Blank <mblank@google.com>
Date:   Wed Aug 29 15:21:22 2012 -0700

    am ae678bac: am 5ac8d387: Always return correct folder capabilities

    * commit 'ae678bac770a284e752d0909487c183c6c25bb5e':
      Always return correct folder capabilities

commit a29620152af1cb9f7ccf988b93c155d7c73d6817
Merge: 894f382 ae60325
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Sat Aug 25 07:18:41 2012 -0700

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

    * commit 'ae6032511c1f425f6df87900d11bd36cea30d157':

commit ae6032511c1f425f6df87900d11bd36cea30d157
Merge: 33ec9fe f87c64f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Sat Aug 25 07:17:01 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ice734cfd6b0d3df15989dd6408537474f2e2b918

commit 894f38219583c29879016a3d8c78a1799d9d99a9
Merge: 2d25979 33ec9fe
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Aug 23 19:47:32 2012 -0700

    am 33ec9fef: (-s ours) am 91b2cb35: am a0ebe8ad: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '33ec9fef289463b26e791d0788b130e89f86f4a3':
      Import translations. DO NOT MERGE

commit 2d259795af8d3f1745d6abb875b51537197bae6b
Merge: 0eab4a8 4391cb1
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Aug 23 19:46:05 2012 -0700

    am 4391cb11: (-s ours) am 32b1858f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '4391cb1184f8ed9af49263bbe0878ff0e5b34299':
      Import translations. DO NOT MERGE

commit 33ec9fef289463b26e791d0788b130e89f86f4a3
Merge: 4391cb1 91b2cb3
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Aug 23 19:45:26 2012 -0700

    am 91b2cb35: am a0ebe8ad: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '91b2cb359581d0a659b285890ebba3b0b90829b2':
      Import translations. DO NOT MERGE

commit 4391cb1184f8ed9af49263bbe0878ff0e5b34299
Merge: 3a7bc8a 32b1858
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Aug 23 19:43:59 2012 -0700

    am 32b1858f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '32b1858fde9d3040a71c726e200453f5501a102e':
      Import translations. DO NOT MERGE

commit 0eab4a8441b0eea51c74acdd52452b2fa3454d4d
Merge: af35482 17954cb
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Aug 23 19:40:59 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit 17954cbbad0b27eb1aa567ef4ade72ce99f526fc
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Aug 23 16:29:29 2012 -0700

    Import translations. DO NOT MERGE

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

commit af354826c003556f1973afb850ffdf1718e59adb
Merge: 2547d90 3a7bc8a
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Aug 23 16:04:32 2012 -0700

    am 3a7bc8af: am e528fe24: am f854ba23: increment versionCode

    * commit '3a7bc8af6fc83ad126fa0429a74ff57bf3f9c9c7':
      increment versionCode

commit 3a7bc8af6fc83ad126fa0429a74ff57bf3f9c9c7
Merge: 17ac138 e528fe2
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Aug 23 16:02:04 2012 -0700

    am e528fe24: am f854ba23: increment versionCode

    * commit 'e528fe244a84a8186b12d8e9d50ad8c7256799a9':
      increment versionCode

commit 2547d90c7d99f8c0386fdbccabbe84062b749e84
Merge: 93bb446 17ac138
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Aug 22 20:50:17 2012 -0700

    am 17ac138d: (-s ours) am c6c6c1fe: am 6767a03e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '17ac138dac2ef280c7fb52ea81be8b277efa7cb8':
      Import translations. DO NOT MERGE

commit 17ac138dac2ef280c7fb52ea81be8b277efa7cb8
Merge: 9bc0171 c6c6c1f
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Aug 22 20:48:54 2012 -0700

    am c6c6c1fe: am 6767a03e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

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

commit 93bb44617cdaec19cccb20f74d7c5375813b2a62
Merge: fc8ce71 9bc0171
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Aug 22 20:48:52 2012 -0700

    am 9bc0171f: (-s ours) am 379c295f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '9bc0171fdbf37e34ece2927fa65588bb4f75841c':
      Import translations. DO NOT MERGE

commit 9bc0171fdbf37e34ece2927fa65588bb4f75841c
Merge: ae75535 379c295
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Aug 22 20:47:25 2012 -0700

    am 379c295f: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '379c295f85278d29a73913604fdf9d1212ebaff2':
      Import translations. DO NOT MERGE

commit fc8ce71ba961163f347c049a9ef49debdd629cf9
Merge: 6559222 d15f9be
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Aug 22 20:44:48 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit 6559222efedb71d5493b853775fbfea496121716
Merge: 596025d ae75535
Author: Paul Westbrook <pwestbro@google.com>
Date:   Wed Aug 22 16:43:08 2012 -0700

    am ae75535a: am 34b0ad8c: resolved conflicts for merge of 12e741dd to jb-mr1-dev

    * commit 'ae75535ace305bc93155025a6586a5aea5300b00':
      Fix build

commit ae75535ace305bc93155025a6586a5aea5300b00
Merge: 71e5c48 34b0ad8
Author: Paul Westbrook <pwestbro@google.com>
Date:   Wed Aug 22 16:40:54 2012 -0700

    am 34b0ad8c: resolved conflicts for merge of 12e741dd to jb-mr1-dev

    * commit '34b0ad8c7278c497a4d8bbc4f5f7f5ab4327a1be':
      Fix build

commit 596025dab8dfcb35adb35cc2dd9901166ea738f6
Merge: 1287e4d 71e5c48
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 22 15:40:01 2012 -0700

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

    * commit '71e5c4819e3fa38f989255b2bd00e394f121ac60':

commit 71e5c4819e3fa38f989255b2bd00e394f121ac60
Merge: c442ef2 a77621d
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 22 15:36:11 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I6bee73125ed67351cd6f905d75e3e7492f39ecb2

commit 1287e4ddba07d0f3f40386523cc39649ad544e33
Merge: dd99434 c442ef2
Author: Marc Blank <mblank@google.com>
Date:   Wed Aug 22 14:24:01 2012 -0700

    am c442ef2c: am 38a8b719: am 70edcf05: Integrate Imap2 into Email

    * commit 'c442ef2c41575720dad18c54170dffd38255a34f':
      Integrate Imap2 into Email

commit c442ef2c41575720dad18c54170dffd38255a34f
Merge: 0d523e1 38a8b71
Author: Marc Blank <mblank@google.com>
Date:   Wed Aug 22 14:21:42 2012 -0700

    am 38a8b719: am 70edcf05: Integrate Imap2 into Email

    * commit '38a8b719d39fb8cfcc9674d91e898d4a7ca796d1':
      Integrate Imap2 into Email

commit dd994345c452b1015cccfb81216647e3a80af0a5
Merge: 7e4d779 0d523e1
Author: Marc Blank <mblank@google.com>
Date:   Wed Aug 22 11:01:19 2012 -0700

    am 0d523e1b: am 806a48e3: am 0b9f23ca: Merge "Report delete capability for all folders" into jb-ub-mail

    * commit '0d523e1bea4a0575f4e78afd86a70eaed67d6264':
      Report delete capability for all folders

commit 0d523e1bea4a0575f4e78afd86a70eaed67d6264
Merge: db3b35f 806a48e
Author: Marc Blank <mblank@google.com>
Date:   Wed Aug 22 10:59:48 2012 -0700

    am 806a48e3: am 0b9f23ca: Merge "Report delete capability for all folders" into jb-ub-mail

    * commit '806a48e33fa06568f54466cc9994c13380545e85':
      Report delete capability for all folders

commit d15f9be8c78cd9815c49b35ae64c7359937f4add
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Aug 22 09:41:30 2012 -0700

    Import translations. DO NOT MERGE

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

commit 7e4d7792d57d3d0e1010f80c7619d06208204edb
Merge: d194bec db3b35f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Aug 21 16:09:51 2012 -0700

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

    * commit 'db3b35f386977763c4843f1e0d843766b7f499e7':
      Handle non-ascii folder names properly
      Fix handling of header data

commit db3b35f386977763c4843f1e0d843766b7f499e7
Merge: 9363a11 4e0a0a7
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Aug 21 16:06:43 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ia5b670916466c3635c6c5ca8b6e4ec72f765924b

commit d194becb754a4311f915d827baa2571c0479b06c
Merge: e16c6a8 9363a11
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 21 12:47:09 2012 -0700

    am 9363a11d: (-s ours) am 166084f2: am 9558de79: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '9363a11dd8c4f5eaf89c93beddb08683957c5704':
      Import translations. DO NOT MERGE

commit e16c6a867cf71eb990f89eb83f07954d263ab2e2
Merge: ddc4a2c 2b28575
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 21 12:45:43 2012 -0700

    am 2b285750: (-s ours) am 5b54801c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '2b285750da5b24a385b3263a8d91a322fbfe56b7':
      Import translations. DO NOT MERGE

commit 9363a11dd8c4f5eaf89c93beddb08683957c5704
Merge: 2b28575 166084f
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 21 12:45:39 2012 -0700

    am 166084f2: am 9558de79: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '166084f2e94e3b27c672a90bc1d17a368777ebba':
      Import translations. DO NOT MERGE

commit 2b285750da5b24a385b3263a8d91a322fbfe56b7
Merge: 37bd847 5b54801
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 21 12:44:07 2012 -0700

    am 5b54801c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '5b54801ca67693bd94b7d583cd526220cf5ada97':
      Import translations. DO NOT MERGE

commit ddc4a2c170fa35a8c49b9463222a0e4bb1645bec
Merge: 97cc2f9 550466f
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 21 12:42:01 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit 97cc2f98dbdaec6a8152f84fc441b1458aed3d40
Merge: eb0a9f1 37bd847
Author: Marc Blank <mblank@google.com>
Date:   Tue Aug 21 12:32:21 2012 -0700

    am 37bd847a: am cf30d663: am a6885ba9: Remember base64 decoding for IMAP attachments

    * commit '37bd847a2af1fef1f4bfbe635305543fda451ac8':
      Remember base64 decoding for IMAP attachments

commit 37bd847a2af1fef1f4bfbe635305543fda451ac8
Merge: 6c9530c cf30d66
Author: Marc Blank <mblank@google.com>
Date:   Tue Aug 21 12:30:47 2012 -0700

    am cf30d663: am a6885ba9: Remember base64 decoding for IMAP attachments

    * commit 'cf30d663493719d83c38f1396723df6f80ece488':
      Remember base64 decoding for IMAP attachments

commit 550466ff2d146dad37559d74038f89a06748ba8e
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 21 09:21:14 2012 -0700

    Import translations. DO NOT MERGE

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

commit eb0a9f1675fb49c10fc15b14881bf85669c5f3fe
Merge: 22963f5 6c9530c
Author: Marc Blank <mblank@google.com>
Date:   Mon Aug 20 16:53:46 2012 -0700

    am 6c9530c0: am 25dba760: am ae597ea9: Handle getExtras() from message list cursor

    * commit '6c9530c08a6a62dbb520b247a3a83530b0846a7e':
      Handle getExtras() from message list cursor

commit 6c9530c08a6a62dbb520b247a3a83530b0846a7e
Merge: 43d8cbe 25dba76
Author: Marc Blank <mblank@google.com>
Date:   Mon Aug 20 16:52:11 2012 -0700

    am 25dba760: am ae597ea9: Handle getExtras() from message list cursor

    * commit '25dba76030a7fdb48d3748d22c60802b90524c83':
      Handle getExtras() from message list cursor

commit 22963f52bcf0e92fa7c8ea9d2f4049bc259a0242
Merge: c8c7903 43d8cbe
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Aug 20 16:00:06 2012 -0700

    am 43d8cbe9: (-s ours) am b660872b: am 3d0525d1: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '43d8cbe9b920b7bd6a4f99503be65aaf2b1771ee':
      Import translations. DO NOT MERGE

commit c8c7903c8e1d0c46353358342c94342793cd1635
Merge: b20d49c 17f9c9b
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Aug 20 16:00:04 2012 -0700

    am 17f9c9b6: (-s ours) am 452a0be8: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '17f9c9b69724328ea7d4d1f8251751946cacaaf4':
      Import translations. DO NOT MERGE

commit 43d8cbe9b920b7bd6a4f99503be65aaf2b1771ee
Merge: 17f9c9b b660872
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Aug 20 15:58:23 2012 -0700

    am b660872b: am 3d0525d1: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

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

commit 17f9c9b69724328ea7d4d1f8251751946cacaaf4
Merge: 9e69dcb 452a0be
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Aug 20 15:58:20 2012 -0700

    am 452a0be8: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '452a0be83994e8d43ea5ba74daa6cd96061395d6':
      Import translations. DO NOT MERGE

commit b20d49c96c9e16a546bece97b1b2fffd1cb74910
Merge: e32ca01 fd29b1a
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Aug 20 15:53:30 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit e32ca01500ebc198dd780bc627355b99a60bc59c
Merge: 1930da8 9e69dcb
Author: Marc Blank <mblank@google.com>
Date:   Mon Aug 20 15:42:29 2012 -0700

    am 9e69dcbc: am 7185a5ea: am 77d166b8: Allow writeTo to accept a list of attachments to send

    * commit '9e69dcbcca2d7ba9e5f05d4378bd97996c257273':
      Allow writeTo to accept a list of attachments to send

commit 9e69dcbcca2d7ba9e5f05d4378bd97996c257273
Merge: 9d0f334 7185a5e
Author: Marc Blank <mblank@google.com>
Date:   Mon Aug 20 15:40:59 2012 -0700

    am 7185a5ea: am 77d166b8: Allow writeTo to accept a list of attachments to send

    * commit '7185a5ea2dfa0c0827e43e95429fa697bc9d3856':
      Allow writeTo to accept a list of attachments to send

commit fd29b1a78a19b9001acad755418b6e6aa02eb833
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Aug 20 08:09:15 2012 -0700

    Import translations. DO NOT MERGE

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

commit 1930da8895fbe9271bc8a9edf163f3c2fa1115de
Merge: ac3713a 9d0f334
Author: Paul Westbrook <pwestbro@google.com>
Date:   Sun Aug 19 13:47:21 2012 -0700

    am 9d0f334f: am a592498f: am 22e9efd4: Supports delete

    * commit '9d0f334f85926cc24b5ef88726778139970c87f3':
      Supports delete

commit 9d0f334f85926cc24b5ef88726778139970c87f3
Merge: 2d61224 a592498
Author: Paul Westbrook <pwestbro@google.com>
Date:   Sun Aug 19 13:45:27 2012 -0700

    am a592498f: am 22e9efd4: Supports delete

    * commit 'a592498f0fbf07bae4d07eb39dbecc15d86439a3':
      Supports delete

commit ac3713aae1f99781d9260673aa543c93313be8c7
Merge: 704ae20 2d61224
Author: Marc Blank <mblank@google.com>
Date:   Sun Aug 19 12:33:15 2012 -0700

    am 2d61224f: am c362ee58: am a41afb05: Merge "Make sure that all access to service map is lock-protected" into jb-ub-mail

    * commit '2d61224fb25ee88ad3699d2de7e86946fa5a0439':
      Make sure that all access to service map is lock-protected

commit 2d61224fb25ee88ad3699d2de7e86946fa5a0439
Merge: f15556f c362ee5
Author: Marc Blank <mblank@google.com>
Date:   Sun Aug 19 12:30:59 2012 -0700

    am c362ee58: am a41afb05: Merge "Make sure that all access to service map is lock-protected" into jb-ub-mail

    * commit 'c362ee58f716bb19eddb8a6678af614524499011':
      Make sure that all access to service map is lock-protected

commit 704ae20d42b019c31eb27ae61784fe8b0573bf91
Merge: 256e237 f15556f
Author: Paul Westbrook <pwestbro@google.com>
Date:   Sun Aug 19 11:55:38 2012 -0700

    am f15556f0: am ece82f4c: am 17c279af: Merge "increment versionCode" into jb-ub-mail

    * commit 'f15556f06a8d1d8e5b5fe73dd1b308b30678db18':
      increment versionCode

commit f15556f06a8d1d8e5b5fe73dd1b308b30678db18
Merge: 3de8617 ece82f4
Author: Paul Westbrook <pwestbro@google.com>
Date:   Sun Aug 19 11:53:53 2012 -0700

    am ece82f4c: am 17c279af: Merge "increment versionCode" into jb-ub-mail

    * commit 'ece82f4c288f2281bcf09ba0c7d525256e181953':
      increment versionCode

commit 256e2375ff04bf8f48faef7cb99a3b5e68e7bcec
Merge: 4e6db63 3de8617
Author: Marc Blank <mblank@google.com>
Date:   Sat Aug 18 17:25:43 2012 -0700

    am 3de8617c: am c3b73201: am 0587513b: Merge "Revert "Make sure that all access to service map is lock-protected"" into jb-ub-mail

    * commit '3de8617c8581be62538d3c7914d75a9adbc60ab3':
      Revert "Make sure that all access to service map is lock-protected"

commit 3de8617c8581be62538d3c7914d75a9adbc60ab3
Merge: c94766b c3b7320
Author: Marc Blank <mblank@google.com>
Date:   Sat Aug 18 17:23:43 2012 -0700

    am c3b73201: am 0587513b: Merge "Revert "Make sure that all access to service map is lock-protected"" into jb-ub-mail

    * commit 'c3b73201f7343d8d809375467e1e9692de8b7c14':
      Revert "Make sure that all access to service map is lock-protected"

commit 4e6db6378580944655883e67568baa9244ca2cef
Merge: b9495ab c94766b
Author: Marc Blank <mblank@google.com>
Date:   Sat Aug 18 16:15:12 2012 -0700

    am c94766b0: am 312e46b5: am 356b4de2: Merge "Make sure that all access to service map is lock-protected" into jb-ub-mail

    * commit 'c94766b0c43b2c5330143b8a09df407a7e9ca140':
      Make sure that all access to service map is lock-protected

commit b9495ab705e1aa3dfa6fece794ebc9c859ef2377
Merge: 3b1e06a 7f4292d
Author: Marc Blank <mblank@google.com>
Date:   Sat Aug 18 16:13:44 2012 -0700

    am 7f4292d9: am b4d51a22: am e2cf1c58: Use proper values for SSL flags; remove obsolete code

    * commit '7f4292d937fc80d379177e05b156f0b85f34f822':
      Use proper values for SSL flags; remove obsolete code

commit c94766b0c43b2c5330143b8a09df407a7e9ca140
Merge: 7f4292d 312e46b
Author: Marc Blank <mblank@google.com>
Date:   Sat Aug 18 16:13:03 2012 -0700

    am 312e46b5: am 356b4de2: Merge "Make sure that all access to service map is lock-protected" into jb-ub-mail

    * commit '312e46b5e07d6be18fd7643a5dbd0186a1a0618c':
      Make sure that all access to service map is lock-protected

commit 7f4292d937fc80d379177e05b156f0b85f34f822
Merge: 7adbde7 b4d51a2
Author: Marc Blank <mblank@google.com>
Date:   Sat Aug 18 16:11:33 2012 -0700

    am b4d51a22: am e2cf1c58: Use proper values for SSL flags; remove obsolete code

    * commit 'b4d51a220fd888bb0305a491e6ad96b3ad1b2f8e':
      Use proper values for SSL flags; remove obsolete code

commit 3b1e06a96988abfde24a646507df48ceb6fed1f9
Merge: 9efa971 7adbde7
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 17 18:12:51 2012 -0700

    am 7adbde72: am 5c882044: am 49f5c000: Add space in IMAP command

    * commit '7adbde72d5f100893be67d38c16b36d4b3ea6cbc':
      Add space in IMAP command

commit 7adbde72d5f100893be67d38c16b36d4b3ea6cbc
Merge: 4277607 5c88204
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 17 18:11:02 2012 -0700

    am 5c882044: am 49f5c000: Add space in IMAP command

    * commit '5c882044c3098f166f3d8a4fe90f652c32f68616':
      Add space in IMAP command

commit 9efa9717cb5eef1788dd09f5dcdd3650f63a6856
Merge: 3596ee6 4277607
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 17 16:15:21 2012 -0700

    am 42776071: am 7475c999: am 0d084651: Merge "Preserve SetupData state on orientation change" into jb-ub-mail

    * commit '427760710547acf4e12af67e81bc865ee21efc57':
      Preserve SetupData state on orientation change

commit 427760710547acf4e12af67e81bc865ee21efc57
Merge: cc34978 7475c99
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 17 16:13:14 2012 -0700

    am 7475c999: am 0d084651: Merge "Preserve SetupData state on orientation change" into jb-ub-mail

    * commit '7475c999d43c9dcb4e3e17653285463e72845254':
      Preserve SetupData state on orientation change

commit 3596ee663b3b1f65440c3f9ea7dc612e3a427d7d
Merge: e7aef5d cc34978
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 17 15:24:58 2012 -0700

    am cc34978a: am 2f7408a5: am 277dd4a9: Show alert message (if any) after Imap2 validation failure

    * commit 'cc34978a52eb4855298719f27cac5f19fdb2938d':
      Show alert message (if any) after Imap2 validation failure

commit cc34978a52eb4855298719f27cac5f19fdb2938d
Merge: 03677f8 2f7408a
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 17 15:23:05 2012 -0700

    am 2f7408a5: am 277dd4a9: Show alert message (if any) after Imap2 validation failure

    * commit '2f7408a53282f973afbf97a3e19f1d1cfa764a7b':
      Show alert message (if any) after Imap2 validation failure

commit e7aef5dd42f002bf81625fe2e5253980b3706ba2
Merge: 17d5208 03677f8
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 17 14:23:40 2012 -0700

    am 03677f82: am 3c1c5a0f: am 1ec08362: Merge "Improve progress strings" into jb-ub-mail

    * commit '03677f82fc730d4acce3fbf7d70b00b847e636a5':
      Improve progress strings

commit 03677f82fc730d4acce3fbf7d70b00b847e636a5
Merge: 312ed55 3c1c5a0
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 17 14:22:37 2012 -0700

    am 3c1c5a0f: am 1ec08362: Merge "Improve progress strings" into jb-ub-mail

    * commit '3c1c5a0f639515eedde6319356027c34ac515f34':
      Improve progress strings

commit 17d52085cc648cfaab244314c67177a32b1b9e82
Merge: 47accf7 312ed55
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 17 14:07:21 2012 -0700

    am 312ed550: am bfef15e3: am 9633312e: Merge "Handle non-ascii folder names properly" into jb-ub-mail

    * commit '312ed5507290c7fe5ee2d89358510f4dbe5e1ae7':
      Handle non-ascii folder names properly

commit 312ed5507290c7fe5ee2d89358510f4dbe5e1ae7
Merge: c558b27 bfef15e
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 17 14:05:20 2012 -0700

    am bfef15e3: am 9633312e: Merge "Handle non-ascii folder names properly" into jb-ub-mail

    * commit 'bfef15e33956907849770f5e889d0e8239c4443c':
      Handle non-ascii folder names properly

commit 47accf78e689989e8bc88e956161cc131355082f
Merge: b763d26 c558b27
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 17 13:48:22 2012 -0700

    am c558b274: am 866eaa6a: am 0bac607e: Merge "Try to find cause for NPE" into jb-ub-mail

    * commit 'c558b274ee035d1d4e07f48ede6fdd3c8630dfaf':
      Try to find cause for NPE

commit c558b274ee035d1d4e07f48ede6fdd3c8630dfaf
Merge: bf34f99 866eaa6
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 17 13:46:16 2012 -0700

    am 866eaa6a: am 0bac607e: Merge "Try to find cause for NPE" into jb-ub-mail

    * commit '866eaa6a218cc467855ba534092062b607aeca4c':
      Try to find cause for NPE

commit b763d26db91d3c9c526f067c01d80d13e1515436
Merge: 7d76f88 bf34f99
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 17 13:11:48 2012 -0700

    am bf34f99f: am 8bcc07d6: am 46656fce: Merge "Remove Imap2 warning" into jb-ub-mail

    * commit 'bf34f99f3e514d28e2725c3456a86564fc648ed5':
      Remove Imap2 warning

commit bf34f99f3e514d28e2725c3456a86564fc648ed5
Merge: c08fe2c 8bcc07d
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 17 13:09:37 2012 -0700

    am 8bcc07d6: am 46656fce: Merge "Remove Imap2 warning" into jb-ub-mail

    * commit '8bcc07d645694b65719b305ba0abcebda4e93a8b':
      Remove Imap2 warning

commit 7d76f88ee6304ad0beab666e7b698f622206d402
Merge: 1a63663 c08fe2c
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 17 12:22:40 2012 -0700

    am c08fe2cb: am 347a00cf: am 11efcb7a: Fix handling of header data

    * commit 'c08fe2cbef101f96e1c63399860b72afd7457ccf':
      Fix handling of header data

commit c08fe2cbef101f96e1c63399860b72afd7457ccf
Merge: f483c82 347a00c
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 17 12:20:36 2012 -0700

    am 347a00cf: am 11efcb7a: Fix handling of header data

    * commit '347a00cfcc350f512534e28d8ec23a95cbf8ea4f':
      Fix handling of header data

commit 1a636632c032c7acc351b46775597c1982e0989e
Merge: 077fb2a f483c82
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 17 11:32:04 2012 -0700

    am f483c82a: am b59beed6: am bc53491b: Ensure that security notification is posted if not active

    * commit 'f483c82ae1dbc69e2422db22141881a6200adff1':
      Ensure that security notification is posted if not active

commit f483c82ae1dbc69e2422db22141881a6200adff1
Merge: e5b8723 b59beed
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 17 11:30:53 2012 -0700

    am b59beed6: am bc53491b: Ensure that security notification is posted if not active

    * commit 'b59beed668396f37ffe5a218d0d8e98afa54cb34':
      Ensure that security notification is posted if not active

commit 077fb2a30d3e42a3b990e19c008cf44cd515ab4c
Merge: 72ced48 e5b8723
Author: Marc Blank <mblank@google.com>
Date:   Thu Aug 16 14:50:25 2012 -0700

    am e5b87235: am c0737ee6: am 49e60998: Merge "Use appropriate prefix to infer server address" into jb-ub-mail

    * commit 'e5b8723526ace8cc3e292cb92be5a349897c03e0':
      Use appropriate prefix to infer server address

commit e5b8723526ace8cc3e292cb92be5a349897c03e0
Merge: 36ff332 c0737ee
Author: Marc Blank <mblank@google.com>
Date:   Thu Aug 16 14:49:11 2012 -0700

    am c0737ee6: am 49e60998: Merge "Use appropriate prefix to infer server address" into jb-ub-mail

    * commit 'c0737ee6bf696d327a651d36409eb054c1ec2774':
      Use appropriate prefix to infer server address

commit 72ced486ab01e64e156f0f3d3f1c235edda08939
Merge: 2e9f4b6 36ff332
Author: Brian Carlstrom <bdc@google.com>
Date:   Thu Aug 16 14:40:22 2012 -0700

    am 36ff3325: am 25167cff: am 318bb9b9: (-s ours) am 696f3d7f: Merge "Disable hostname verification with client certificates when requested by user"

    * commit '36ff3325be8744c93ad4e6bcf73c87df56b1872c':
      Disable hostname verification with client certificates when requested by user

commit 36ff3325be8744c93ad4e6bcf73c87df56b1872c
Merge: cc6f6c4 25167cf
Author: Brian Carlstrom <bdc@google.com>
Date:   Thu Aug 16 14:38:33 2012 -0700

    am 25167cff: am 318bb9b9: (-s ours) am 696f3d7f: Merge "Disable hostname verification with client certificates when requested by user"

    * commit '25167cffc98a7a1d32e843deecc28eed4d2d640a':
      Disable hostname verification with client certificates when requested by user

commit 2e9f4b6233c5378d6568448cd24023bde96e215a
Merge: 0064886 cc6f6c4
Author: Marc Blank <mblank@google.com>
Date:   Thu Aug 16 12:01:45 2012 -0700

    am cc6f6c48: am c71c4ce7: am 0e969171: Update client connection manager w/ bdc fix in AOSP branch

    * commit 'cc6f6c4892838e6e9dc02d84b166ffe87ddc8768':
      Update client connection manager w/ bdc fix in AOSP branch

commit cc6f6c4892838e6e9dc02d84b166ffe87ddc8768
Merge: 6c95f9f c71c4ce
Author: Marc Blank <mblank@google.com>
Date:   Thu Aug 16 11:59:42 2012 -0700

    am c71c4ce7: am 0e969171: Update client connection manager w/ bdc fix in AOSP branch

    * commit 'c71c4ce743f095c0cd486044b627b5247b895011':
      Update client connection manager w/ bdc fix in AOSP branch

commit 0064886af509b32c4300239470d08313afaedc78
Merge: b5491ba 6c95f9f
Author: Marc Blank <mblank@google.com>
Date:   Thu Aug 16 10:27:06 2012 -0700

    am 6c95f9f8: am fe009e33: am cf3b3ae9: Prevent NPE while getting service

    * commit '6c95f9f8b718a5cee6a2e0467f43af4cf6ad409e':
      Prevent NPE while getting service

commit 6c95f9f8b718a5cee6a2e0467f43af4cf6ad409e
Merge: 8453de4 fe009e3
Author: Marc Blank <mblank@google.com>
Date:   Thu Aug 16 10:24:42 2012 -0700

    am fe009e33: am cf3b3ae9: Prevent NPE while getting service

    * commit 'fe009e333afc055c6a81fea07af7214ec61d2725':
      Prevent NPE while getting service

commit b5491ba9b9f78be029cd4097b72fe2a099fafef4
Merge: e511159 8453de4
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 15 08:32:28 2012 -0700

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

    * commit '8453de40bf9a0bfb6c9fd26d0d19c3805f81e0be':

commit 8453de40bf9a0bfb6c9fd26d0d19c3805f81e0be
Merge: 8698a4f cc682b8
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 15 08:28:19 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: If0d71e597825516625b1b67c7113fc2aaefd7754

commit e511159f77ca2066daf00773cfcfae4c4634db8f
Merge: c60f38a 8698a4f
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 14 20:40:45 2012 -0700

    am 8698a4f2: (-s ours) am 33747c81: am ed4017a6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '8698a4f2568a600c73352fce12d88dd9101a68d6':
      Import translations. DO NOT MERGE

commit c60f38abd0813967474fa84f755745bc1c41e505
Merge: 049852b ddebac8
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 14 20:40:43 2012 -0700

    am ddebac8b: (-s ours) am 237e2e82: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

commit 8698a4f2568a600c73352fce12d88dd9101a68d6
Merge: ddebac8 33747c8
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 14 20:38:50 2012 -0700

    am 33747c81: am ed4017a6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '33747c819c268142162b35bee0f960f163c64443':
      Import translations. DO NOT MERGE

commit ddebac8bf3972b410b5e43c0a9c1bc9ffb496e10
Merge: 0597a9e 237e2e8
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 14 20:38:49 2012 -0700

    am 237e2e82: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '237e2e828d53f4af09a241d39030473f8c042d77':
      Import translations. DO NOT MERGE

commit 049852b0345618e42e543238509d690eaa7c0319
Merge: 8e315f6 808db32
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 14 20:35:15 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit 808db32120b37d8cb695376b26d9c381e14cdd4e
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 14 20:06:09 2012 -0700

    Import translations. DO NOT MERGE

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

commit 8e315f60f43e3b31c15ce1c1fb192303961aee5f
Merge: 78180af 0597a9e
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 14 10:52:29 2012 -0700

    am 0597a9e2: (-s ours) am 4b7d9dfb: am bb7363ce: (-s ours) Import translations. DO NOT MERGE

    * commit '0597a9e27b20cbc81b450f1740fff6c4d10626d8':
      Import translations. DO NOT MERGE

commit 78180afb48b0de7f2a0033b4778a306c4c78cdff
Merge: 03d524b 9e4e277
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 14 10:50:32 2012 -0700

    am 9e4e2770: (-s ours) am ac6fb32e: Import translations. DO NOT MERGE

    * commit '9e4e27701279da8c96b4453e3b10434c90096cbe':
      Import translations. DO NOT MERGE

commit 0597a9e27b20cbc81b450f1740fff6c4d10626d8
Merge: 9e4e277 4b7d9df
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 14 10:50:15 2012 -0700

    am 4b7d9dfb: am bb7363ce: (-s ours) Import translations. DO NOT MERGE

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

commit 9e4e27701279da8c96b4453e3b10434c90096cbe
Merge: d6bd5b1 ac6fb32
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 14 10:47:15 2012 -0700

    am ac6fb32e: Import translations. DO NOT MERGE

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

commit 03d524bd526b940cf8825862763b76e680c0d52d
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Aug 14 10:01:43 2012 -0700

    Import translations. DO NOT MERGE

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

commit be366ec8bf5f281dac433cecfc3cd35d5695d57c
Merge: 6653708 d6bd5b1
Author: Mindy Pereira <mindyp@google.com>
Date:   Mon Aug 13 10:48:46 2012 -0700

    am d6bd5b1d: am 01c5310a: am 9fbb81c9: Dont disable compose until accounts are added; listen for account chages to update cache

    * commit 'd6bd5b1d659c5e8b855bee1a47cc8b802dc2309f':
      Dont disable compose until accounts are added; listen for account chages to update cache

commit d6bd5b1d659c5e8b855bee1a47cc8b802dc2309f
Merge: 2ee1aa3 01c5310
Author: Mindy Pereira <mindyp@google.com>
Date:   Mon Aug 13 10:46:34 2012 -0700

    am 01c5310a: am 9fbb81c9: Dont disable compose until accounts are added; listen for account chages to update cache

    * commit '01c5310a674abe0ba44fe117d8938365187b9c9b':
      Dont disable compose until accounts are added; listen for account chages to update cache

commit 6653708c3d7ad3f6821b91135e1910b1e6d80535
Merge: 0dea0a7 2ee1aa3
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Aug 10 16:08:01 2012 -0700

    am 2ee1aa33: (-s ours) am 0f507e21: am 7d015353: (-s ours) Import translations. DO NOT MERGE

    * commit '2ee1aa330e89520fe9fd24563e6ab33b1e3b4f6a':
      Import translations. DO NOT MERGE

commit 0dea0a7d939dc578882f80a772b0b064950f53e3
Merge: 01c886f 8a601f9
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Aug 10 16:08:00 2012 -0700

    am 8a601f97: (-s ours) am 9c7a45aa: Import translations. DO NOT MERGE

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

commit 2ee1aa330e89520fe9fd24563e6ab33b1e3b4f6a
Merge: 8a601f9 0f507e2
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Aug 10 16:06:23 2012 -0700

    am 0f507e21: am 7d015353: (-s ours) Import translations. DO NOT MERGE

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

commit 8a601f97685e3a898e4000afa79ff5668fe8461a
Merge: 81bf6fc 9c7a45a
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Aug 10 16:06:21 2012 -0700

    am 9c7a45aa: Import translations. DO NOT MERGE

    * commit '9c7a45aaa850ed9dbfeb036e409a29cad7cb8865':
      Import translations. DO NOT MERGE

commit 01c886f6ebb9bc6d932dc01cfc3040237e59f735
Merge: 2277c13 d0a300f
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Aug 10 16:03:03 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit d0a300f9010b43bba5e3586bfca3b3bf6badc7bc
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Aug 10 09:09:46 2012 -0700

    Import translations. DO NOT MERGE

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

commit 2277c13189128f00de5f3b069191487e7fd58afe
Merge: 6b82f00 81bf6fc
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Aug 10 08:55:56 2012 -0700

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

    * commit '81bf6fc0b807b85e02617f8fa51ea36cbb909ef6':

commit 81bf6fc0b807b85e02617f8fa51ea36cbb909ef6
Merge: 57776a9 f0bc222
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Aug 10 08:53:32 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ia4b5e630ff96eec00cdcbf3037ea2d31a03a7631

commit 6b82f005d61a5ba34b832a36dee19af4d839db7f
Merge: 37fbf9a 57776a9
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Aug 9 21:00:59 2012 -0700

    am 57776a90: (-s ours) am 011e1a01: am 7da9459d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '57776a900fb0013c3e6f717a79ca749f9c70f734':
      Import translations. DO NOT MERGE

commit 37fbf9a9d10eafd0147900e2c707ce5e758a9102
Merge: 75ae408 75d7aa6
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Aug 9 21:00:58 2012 -0700

    am 75d7aa6b: (-s ours) am 3f97b720: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '75d7aa6ba54875bc7498f7ca43e6ac11dbc55192':
      Import translations. DO NOT MERGE

commit 57776a900fb0013c3e6f717a79ca749f9c70f734
Merge: 75d7aa6 011e1a0
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Aug 9 20:59:55 2012 -0700

    am 011e1a01: am 7da9459d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '011e1a01c1787019107decc5484752bea05a79b1':
      Import translations. DO NOT MERGE

commit 75d7aa6ba54875bc7498f7ca43e6ac11dbc55192
Merge: 213b0e2 3f97b72
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Aug 9 20:59:53 2012 -0700

    am 3f97b720: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '3f97b7205e2fc115c419c10e01fa07073630e893':
      Import translations. DO NOT MERGE

commit 75ae408853d26e2d8a84bf6e3d923c7da2004872
Merge: 1707337 6a32ef0
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Aug 9 20:56:44 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit 1707337113f373c5991d248d0ae417bc50556f0c
Merge: 082bd88 213b0e2
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Aug 9 16:38:51 2012 -0700

    am 213b0e27: am 1b240f70: am 33858c77: Fix crash when validating email hostAuth

    * commit '213b0e27ab3488d17cc0b314161460d1a0742b6e':
      Fix crash when validating email hostAuth

commit 213b0e27ab3488d17cc0b314161460d1a0742b6e
Merge: f93acf2 1b240f7
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Aug 9 16:36:41 2012 -0700

    am 1b240f70: am 33858c77: Fix crash when validating email hostAuth

    * commit '1b240f7016e2e25aba7f609dcf8e8d6d04ef2bcd':
      Fix crash when validating email hostAuth

commit 6a32ef0ef2f144fc002b31bbd7f789ba451b2099
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Aug 9 10:14:25 2012 -0700

    Import translations. DO NOT MERGE

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

commit 082bd885256bdb8bd7c8850cab2ca02d80738734
Merge: b5c4d16 f93acf2
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Aug 8 15:11:28 2012 -0700

    am f93acf26: am c86bb3b6: am 8235253e: (-s ours) am 454ac69f: Merge "Keep MessageCompose enabled if no accounts exists"

    * commit 'f93acf26471177504a49d9d67e40abc19f0750e6':
      Keep MessageCompose enabled if no accounts exists

commit f93acf26471177504a49d9d67e40abc19f0750e6
Merge: d158737 c86bb3b
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Aug 8 14:10:43 2012 -0700

    am c86bb3b6: am 8235253e: (-s ours) am 454ac69f: Merge "Keep MessageCompose enabled if no accounts exists"

    * commit 'c86bb3b60732bd6142fb955edc734407d1e48509':
      Keep MessageCompose enabled if no accounts exists

commit b5c4d16ccba1cd0c73beecc05ab69740e3673d8b
Merge: b1ca2b2 d158737
Author: Paul Westbrook <pwestbro@google.com>
Date:   Wed Aug 8 09:07:23 2012 -0700

    am d1587376: am 6af8f20e: am 16e697e3: Merge "Fix ConcurrentModificationException" into jb-ub-mail

    * commit 'd1587376dbace10d1a4be28b6caedd49c81112e5':
      Fix ConcurrentModificationException

commit b1ca2b20208150a76583fac1b9efb7f98ad781cb
Merge: c21b3ef fec4039
Author: Paul Westbrook <pwestbro@google.com>
Date:   Wed Aug 8 09:05:54 2012 -0700

    am fec4039e: am 14bd4a91: am 9439595e: Fix NPE when proceeding without selecting trash folder

    * commit 'fec4039e6e2b978ae851b87f41504d021d610c84':
      Fix NPE when proceeding without selecting trash folder

commit d1587376dbace10d1a4be28b6caedd49c81112e5
Merge: fec4039 6af8f20
Author: Paul Westbrook <pwestbro@google.com>
Date:   Wed Aug 8 09:05:30 2012 -0700

    am 6af8f20e: am 16e697e3: Merge "Fix ConcurrentModificationException" into jb-ub-mail

    * commit '6af8f20e991bc02d15db0c1d26130b1e941df5f2':
      Fix ConcurrentModificationException

commit fec4039e6e2b978ae851b87f41504d021d610c84
Merge: 56f2c1b 14bd4a9
Author: Paul Westbrook <pwestbro@google.com>
Date:   Wed Aug 8 09:04:02 2012 -0700

    am 14bd4a91: am 9439595e: Fix NPE when proceeding without selecting trash folder

    * commit '14bd4a9123d3e5184e4315b075b75610603f1126':
      Fix NPE when proceeding without selecting trash folder

commit c21b3ef30b89a735594da3ec7bd74bbb42b4d8d3
Merge: dee8c3b 56f2c1b
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 8 08:21:53 2012 -0700

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

    * commit '56f2c1b8c68134a38b58d45f1ba4acee3c9f06f3':
      Catch exception in monkey runs

commit 56f2c1b8c68134a38b58d45f1ba4acee3c9f06f3
Merge: 1f99fbb 60baefa
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 8 08:17:49 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Id1cca85cfdaff315d00c01944f48d3f3856ff73a

commit dee8c3b48bffdf95ab1e9e1d4e887d06144b22d0
Merge: 5a3e9cd 1f99fbb
Author: Paul Westbrook <pwestbro@google.com>
Date:   Tue Aug 7 11:11:10 2012 -0700

    am 1f99fbb3: am db1ae92d: am 532bcf4a: Catch exception in monkey runs

    * commit '1f99fbb3bf248f6027d629cda49c0a1f99e67143':
      Catch exception in monkey runs

commit 5a3e9cdede1bd3105d6598212b65845969d1e953
Merge: 7ea71bf 383de31
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Aug 7 11:08:30 2012 -0700

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

    * commit '383de31c8f62a4cc55343d7824a667d214dc263f':

commit 1f99fbb3bf248f6027d629cda49c0a1f99e67143
Merge: 383de31 db1ae92
Author: Paul Westbrook <pwestbro@google.com>
Date:   Tue Aug 7 11:07:31 2012 -0700

    am db1ae92d: am 532bcf4a: Catch exception in monkey runs

    * commit 'db1ae92d3ef44629de3ae5db2c9f2682eacd908a':
      Catch exception in monkey runs

commit 383de31c8f62a4cc55343d7824a667d214dc263f
Merge: 683f656 4d3cd68
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Aug 7 11:04:36 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ia52c251b28795a9244fec424e9d149278e3af280

commit 7ea71bf24aa0a9c6cd554ec5aceccedff2fde78d
Merge: 0351217 683f656
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Aug 6 19:28:40 2012 -0700

    am 683f6564: (-s ours) am 0caca3ec: am d0dbda3a: (-s ours) Import translations. DO NOT MERGE

    * commit '683f6564da70b9cef11a5d209e559cc04d65e5e4':
      Import translations. DO NOT MERGE

commit 0351217451f793a1ac28986a4a837bc706554f21
Merge: cd6969b 2c348f0
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Aug 6 19:27:12 2012 -0700

    am 2c348f0d: (-s ours) am 94a20bb6: Import translations. DO NOT MERGE

    * commit '2c348f0d3e33ddff88d5fdaf6ea47f8027450216':
      Import translations. DO NOT MERGE

commit 683f6564da70b9cef11a5d209e559cc04d65e5e4
Merge: 2c348f0 0caca3e
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Aug 6 19:27:09 2012 -0700

    am 0caca3ec: am d0dbda3a: (-s ours) Import translations. DO NOT MERGE

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

commit 2c348f0d3e33ddff88d5fdaf6ea47f8027450216
Merge: 7bf38d6 94a20bb
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Aug 6 19:25:37 2012 -0700

    am 94a20bb6: Import translations. DO NOT MERGE

    * commit '94a20bb66c1bf0cc6e94fca94ed41b7a161a8c70':
      Import translations. DO NOT MERGE

commit cd6969b99cbd2a8f0138ddcba8712d83c251d81f
Merge: 6f23d59 efdee82
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Aug 6 19:25:18 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit 6f23d595b4c357d70adf5c3bf61b0cbb408712f7
Merge: ef853e0 7bf38d6
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Aug 6 13:26:59 2012 -0700

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

    * commit '7bf38d632b35a2fb1e4ba2e8aa0743f4dffabd76':

commit 7bf38d632b35a2fb1e4ba2e8aa0743f4dffabd76
Merge: 3d97c1d d4a7c36
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Aug 6 13:25:08 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I18ee79b8750fcca5c7b4b2c9b8f791bd33333cd3

commit efdee82858ef3f6258896125afcd2b640b67829d
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Aug 6 10:49:59 2012 -0700

    Import translations. DO NOT MERGE

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

commit ef853e09b31e7d9b2737684a4beb6f41e4eba0e6
Merge: b612ed1 3d97c1d
Author: Marc Blank <mblank@google.com>
Date:   Sat Aug 4 11:39:53 2012 -0700

    am 3d97c1d9: am 39c0f79a: Merge "Explicitly export content providers" into jb-mr1-dev

    * commit '3d97c1d936e0b6dc604e303a8bd6c430ea2a3151':
      Explicitly export content providers

commit 3d97c1d936e0b6dc604e303a8bd6c430ea2a3151
Merge: 44b4a40 39c0f79
Author: Marc Blank <mblank@google.com>
Date:   Sat Aug 4 11:38:03 2012 -0700

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

    * commit '39c0f79a28c017921b79c9ebe51807ff8f75fa9c':
      Explicitly export content providers

commit b612ed148601e4222c77ef4b3028fe7326186697
Merge: fee915e 44b4a40
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 3 17:15:28 2012 -0700

    am 44b4a409: am 24617f7c: am e340b1f4: Merge "Progress updates for POP3 message downloads" into jb-ub-mail

    * commit '44b4a40907eb5804c966b8f7f1dab6740f5d72f9':
      Progress updates for POP3 message downloads

commit 44b4a40907eb5804c966b8f7f1dab6740f5d72f9
Merge: e604ac2 24617f7
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 3 17:13:17 2012 -0700

    am 24617f7c: am e340b1f4: Merge "Progress updates for POP3 message downloads" into jb-ub-mail

    * commit '24617f7c95746bfa0b80a2bd7727d3974ce71ad7':
      Progress updates for POP3 message downloads

commit fee915e90b905dc4870eaf89c3a67fc81831e795
Merge: 9130404 e604ac2
Author: Ying Wang <wangying@google.com>
Date:   Fri Aug 3 14:34:56 2012 -0700

    am e604ac21: (-s ours) am ed61d7ff: am 2837d7e9: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

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

commit 91304042f0a2db9d2e15ee6aad4b4431614c26bb
Merge: 78e2f44 53ce2a5
Author: Ying Wang <wangying@google.com>
Date:   Fri Aug 3 14:34:55 2012 -0700

    am 53ce2a55: (-s ours) am 43217521: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '53ce2a559c72be7e4ea30cdfcfde58009801020a':
      Import translations. DO NOT MERGE

commit e604ac215ff78050a423058a0e04c3e71b4c10c3
Merge: 53ce2a5 ed61d7f
Author: Ying Wang <wangying@google.com>
Date:   Fri Aug 3 14:33:19 2012 -0700

    am ed61d7ff: am 2837d7e9: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

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

commit 53ce2a559c72be7e4ea30cdfcfde58009801020a
Merge: 825552a 4321752
Author: Ying Wang <wangying@google.com>
Date:   Fri Aug 3 14:33:18 2012 -0700

    am 43217521: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '432175215eb33f1be134c9a6ddc7b37e027b4ed1':
      Import translations. DO NOT MERGE

commit 78e2f443f48798acf4ec4edf3ad685c24163c7f3
Merge: a655780 825552a
Author: Paul Westbrook <pwestbro@google.com>
Date:   Fri Aug 3 14:31:40 2012 -0700

    am 825552a8: am e4fe67d7: am b74f2204: Make sure to respect the projection from the client

    * commit '825552a80427f618b035b80a7417636b068f0508':
      Make sure to respect the projection from the client

commit a655780921ffc6717a4de06a591f0bc661747f6a
Merge: 61a46ca dddf575
Author: Ying Wang <wangying@google.com>
Date:   Fri Aug 3 14:27:56 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit 825552a80427f618b035b80a7417636b068f0508
Merge: 244c75f e4fe67d
Author: Paul Westbrook <pwestbro@google.com>
Date:   Fri Aug 3 14:26:06 2012 -0700

    am e4fe67d7: am b74f2204: Make sure to respect the projection from the client

    * commit 'e4fe67d7d8fb18053967ea42007d4f571d0c24c4':
      Make sure to respect the projection from the client

commit 61a46cae6c03bf3e4596baeec9a8dce3ba26f200
Merge: c618f7b 244c75f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Aug 3 14:00:00 2012 -0700

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

    * commit '244c75f4332e3a3a85edd40884328fd7aa1c5197':
      POP3 renovation

commit 244c75f4332e3a3a85edd40884328fd7aa1c5197
Merge: cea240e 4f0374d
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Aug 3 13:56:46 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I0cb9ec84a5e3a6eda0c2ccb4a3feefdf7ba15919

commit c618f7baf390aec8fecf43cd84416d08033d2058
Merge: 0a406a4 cea240e
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Aug 3 13:30:31 2012 -0700

    am cea240ed: (-s ours) am 77edb848: am 817944a6: (-s ours) Reconcile with jb-release - do not merge

    * commit 'cea240ed8898f3b9ee1501d952f489800bfb0e81':
      Don't set DPM password expiration unless it has changed

commit cea240ed8898f3b9ee1501d952f489800bfb0e81
Merge: a847f75 77edb84
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Aug 3 13:28:47 2012 -0700

    am 77edb848: am 817944a6: (-s ours) Reconcile with jb-release - do not merge

    * commit '77edb8482e1029a7f6993e75179e485783a215c1':
      Don't set DPM password expiration unless it has changed

commit 0a406a478fccbff4e16d845524ed3f9b03fde19b
Merge: c5a290b a847f75
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 3 13:28:37 2012 -0700

    am a847f757: am 6643dbcb: am 10c71582: Merge "Fix NPE during Imap2 setup when using WiFi only device" into jb-ub-mail

    * commit 'a847f75763ae057f46ac2663b715ac078b085522':
      Fix NPE during Imap2 setup when using WiFi only device

commit a847f75763ae057f46ac2663b715ac078b085522
Merge: f51ac43 6643dbc
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 3 13:26:50 2012 -0700

    am 6643dbcb: am 10c71582: Merge "Fix NPE during Imap2 setup when using WiFi only device" into jb-ub-mail

    * commit '6643dbcb6abfbe9442590bd3dc455ea361df8bb1':
      Fix NPE during Imap2 setup when using WiFi only device

commit c5a290b887c617703bfec3e5bfe66e59c51c047e
Merge: c02955b f51ac43
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 3 12:20:38 2012 -0700

    am f51ac433: am c4f0a7ee: am cee98816: Fix typo in DBHelper

    * commit 'f51ac4336c4bb0d7ebb485151b8635aecd1a3c09':
      Fix typo in DBHelper

commit f51ac4336c4bb0d7ebb485151b8635aecd1a3c09
Merge: 9730a6c c4f0a7e
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 3 12:18:14 2012 -0700

    am c4f0a7ee: am cee98816: Fix typo in DBHelper

    * commit 'c4f0a7ee201d35c08b8072705240318de1d267ee':
      Fix typo in DBHelper

commit dddf57508e5a00bc8e2ff99b1bbd9891ea00a140
Author: Ying Wang <wangying@google.com>
Date:   Fri Aug 3 11:17:47 2012 -0700

    Import translations. DO NOT MERGE

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

commit c02955bd35fec2cc98c60c3cbad48b89c79c48ad
Merge: bdfdc1c 9730a6c
Author: Mindy Pereira <mindyp@google.com>
Date:   Fri Aug 3 11:08:22 2012 -0700

    am 9730a6c0: am 80dd6b5a: am c86cd8fb: Just use a regular text view.

    * commit '9730a6c05b5ba165f62b5a8d3cb73af523fea4c7':
      Just use a regular text view.

commit 9730a6c05b5ba165f62b5a8d3cb73af523fea4c7
Merge: ebb3c3b 80dd6b5
Author: Mindy Pereira <mindyp@google.com>
Date:   Fri Aug 3 11:05:47 2012 -0700

    am 80dd6b5a: am c86cd8fb: Just use a regular text view.

    * commit '80dd6b5a6dcb23e74c53a95be6dd596d044284f9':
      Just use a regular text view.

commit bdfdc1cc383a8dc564a177412cfd19a763ec3d9f
Merge: 5e670cd ebb3c3b
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 3 10:10:02 2012 -0700

    am ebb3c3be: am c19a26f5: am cbd32b78: Fall back to 10 minute sync if IDLE isn\'t supporte

    * commit 'ebb3c3be160eada3f769a7244226c12d73da2ae6':
      Fall back to 10 minute sync if IDLE isn't supporte

commit ebb3c3be160eada3f769a7244226c12d73da2ae6
Merge: a3eddf2 c19a26f
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 3 09:53:00 2012 -0700

    am c19a26f5: am cbd32b78: Fall back to 10 minute sync if IDLE isn\'t supporte

    * commit 'c19a26f556fdac87ace1d8d85fa2ba2911c623b1':
      Fall back to 10 minute sync if IDLE isn't supporte

commit 5e670cd30ea0320202602fc74cdaf3eee476df71
Merge: ad5f26c a3eddf2
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 3 09:13:08 2012 -0700

    am a3eddf26: am 3e0fcc5e: am 843164ce: Merge "Add laposte.net to providers.xml" into jb-ub-mail

    * commit 'a3eddf26b1b438e838bfed2894315bb46b3a9f62':
      Add laposte.net to providers.xml

commit a3eddf26b1b438e838bfed2894315bb46b3a9f62
Merge: 98b07f9 3e0fcc5
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 3 09:11:03 2012 -0700

    am 3e0fcc5e: am 843164ce: Merge "Add laposte.net to providers.xml" into jb-ub-mail

    * commit '3e0fcc5ea501e4371cc2eb85e941a71099887a55':
      Add laposte.net to providers.xml

commit ad5f26c80bbedb6e94fd9da0988fd170d9828176
Merge: 39cb509 98b07f9
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 3 00:18:41 2012 -0700

    am 98b07f98: am 68102831: am e68efceb: Merge "Handle server deletion of local POP deletions" into jb-ub-mail

    * commit '98b07f98241422f95c0a75eabf715f810ddede7d':
      Handle server deletion of local POP deletions

commit 98b07f98241422f95c0a75eabf715f810ddede7d
Merge: 062e79c 6810283
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 3 00:16:40 2012 -0700

    am 68102831: am e68efceb: Merge "Handle server deletion of local POP deletions" into jb-ub-mail

    * commit '6810283183c1265d36d37e1d526bde4f6b5d8cb3':
      Handle server deletion of local POP deletions

commit 39cb509dd48b11bcc24f3e14a31002b07559ddad
Merge: ee7b743 062e79c
Author: Marc Blank <mblank@google.com>
Date:   Thu Aug 2 22:17:22 2012 -0700

    am 062e79c0: am 209ea738: am 4ba99bfb: Prevent crash in Email while viewing message

    * commit '062e79c0f12347042862516bd7c0aba43670a4a1':
      Prevent crash in Email while viewing message

commit 062e79c0f12347042862516bd7c0aba43670a4a1
Merge: 8674b8d 209ea73
Author: Marc Blank <mblank@google.com>
Date:   Thu Aug 2 22:16:03 2012 -0700

    am 209ea738: am 4ba99bfb: Prevent crash in Email while viewing message

    * commit '209ea738ad2db1ce9b2438c70e150a96ed803800':
      Prevent crash in Email while viewing message

commit ee7b743af67b2c0205f06a4434e5f47980922edf
Merge: c2aa58b 8674b8d
Author: Marc Blank <mblank@google.com>
Date:   Thu Aug 2 15:52:04 2012 -0700

    am 8674b8d4: am 28d94047: am f6db592c: POP3 renovation

    * commit '8674b8d4dae23d73d986f2098f460ed07559172c':
      POP3 renovation

commit 8674b8d4dae23d73d986f2098f460ed07559172c
Merge: 5a4770a 28d9404
Author: Marc Blank <mblank@google.com>
Date:   Thu Aug 2 15:49:35 2012 -0700

    am 28d94047: am f6db592c: POP3 renovation

    * commit '28d940472d593f74149f99f0206a311971792b4d':
      POP3 renovation

commit c2aa58bc5b18622a5ad85075d72a9d2d72ab8584
Merge: a10726b 5a4770a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Aug 2 15:09:14 2012 -0700

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

    * commit '5a4770ad9309051c7c46b78ca8dd62a7be7bed6a':

commit 5a4770ad9309051c7c46b78ca8dd62a7be7bed6a
Merge: 7095630 d33280f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Aug 2 11:27:05 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I8dcdb136c545587a546411c37fb3160b319ab2e5

commit a10726bee7a046b219db578657654d187f6a5ab4
Merge: 43eeb32 7095630
Author: Ying Wang <wangying@google.com>
Date:   Wed Aug 1 15:17:52 2012 -0700

    am 70956300: (-s ours) am 0f435706: am 1bdae57a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '709563009ef583f25f8de4a94410a6466344afc3':
      Import translations. DO NOT MERGE

commit 43eeb3295a49e4d8986db1084d28f5e86d01b4c2
Merge: a780a53 d8f20b9
Author: Ying Wang <wangying@google.com>
Date:   Wed Aug 1 15:17:50 2012 -0700

    am d8f20b99: (-s ours) am 38bb8dd9: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

commit 709563009ef583f25f8de4a94410a6466344afc3
Merge: d8f20b9 0f43570
Author: Ying Wang <wangying@google.com>
Date:   Wed Aug 1 15:15:51 2012 -0700

    am 0f435706: am 1bdae57a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

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

commit d8f20b994905ef2797bbcdd41ad85e4cbef20d42
Merge: 5e67a83 38bb8dd
Author: Ying Wang <wangying@google.com>
Date:   Wed Aug 1 15:14:15 2012 -0700

    am 38bb8dd9: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '38bb8dd911e4f9e53fcde8b78f8eb95c66e2da95':
      Import translations. DO NOT MERGE

commit a780a53ae0dad5326324fdf632c4034da418187e
Merge: 0a43809 fbc7b4d
Author: Ying Wang <wangying@google.com>
Date:   Wed Aug 1 15:12:12 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit 0a438097fa8fe815c0b5a743e26387cdeb15e5af
Merge: e5383d1 5e67a83
Author: Marc Blank <mblank@google.com>
Date:   Wed Aug 1 14:55:23 2012 -0700

    am 5e67a833: am 965c1b8f: am 3a83ec1c: Don\'t save connection manager for autodiscover/validation

    * commit '5e67a833d4637480dc8a15a38f8cd653ab3a6cee':
      Don't save connection manager for autodiscover/validation

commit e5383d13f2134547681c4ec1b5f2debbbda3ba64
Merge: 639c240 a90a47b
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 1 14:50:39 2012 -0700

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

    * commit 'a90a47b75277ce06bcb3f1ee046059e04c08102f':

commit 5e67a833d4637480dc8a15a38f8cd653ab3a6cee
Merge: a90a47b 965c1b8
Author: Marc Blank <mblank@google.com>
Date:   Wed Aug 1 14:50:03 2012 -0700

    am 965c1b8f: am 3a83ec1c: Don\'t save connection manager for autodiscover/validation

    * commit '965c1b8f404063a1a5e1ea5a71efc8fbd98bf41c':
      Don't save connection manager for autodiscover/validation

commit a90a47b75277ce06bcb3f1ee046059e04c08102f
Merge: cacb606 ddc558c
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 1 13:12:13 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Id7977b8d751de598c81c7f6984b613b95947c61f

commit 639c2406511848fa44ce6e870d65c418b3e90653
Merge: 889217c cacb606
Author: Marc Blank <mblank@google.com>
Date:   Wed Aug 1 11:52:05 2012 -0700

    am cacb606e: am 4db26db3: am 42a63c5b: Merge "Revert "Can\'t explain that!"" into jb-ub-mail

    * commit 'cacb606e0e67b888e9d30bf2650aad418e9397d3':
      Revert "Can't explain that!"

commit cacb606e0e67b888e9d30bf2650aad418e9397d3
Merge: 4ece866 4db26db
Author: Marc Blank <mblank@google.com>
Date:   Wed Aug 1 11:44:42 2012 -0700

    am 4db26db3: am 42a63c5b: Merge "Revert "Can\'t explain that!"" into jb-ub-mail

    * commit '4db26db390a3df2cc2b9ba63503fb876326edf92':
      Revert "Can't explain that!"

commit 889217cde7d47a55177d802e5f02acb17ac44687
Merge: 3a4f155 4ece866
Author: Marc Blank <mblank@google.com>
Date:   Wed Aug 1 11:40:29 2012 -0700

    am 4ece8667: am 868acea5: am d89d702a: Merge "Can\'t explain that!" into jb-ub-mail

    * commit '4ece86676875401e3e26ef6f0412349c618b6510':
      Can't explain that!

commit 4ece86676875401e3e26ef6f0412349c618b6510
Merge: f82fa85 868acea
Author: Marc Blank <mblank@google.com>
Date:   Wed Aug 1 11:38:17 2012 -0700

    am 868acea5: am d89d702a: Merge "Can\'t explain that!" into jb-ub-mail

    * commit '868acea500e6abff4d1182965f9ad97fc796a0a9':
      Can't explain that!

commit fbc7b4d78a177aac81a66da2b5fbafebfe61f1b9
Author: Ying Wang <wangying@google.com>
Date:   Wed Aug 1 11:22:39 2012 -0700

    Import translations. DO NOT MERGE

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

commit 3a4f15583925d6f1a3dd8c067c6138448c4b3844
Merge: f0f1f7c f82fa85
Author: Vikram Aggarwal <viki@google.com>
Date:   Wed Aug 1 10:21:20 2012 -0700

    am f82fa85c: am 257fb7ab: am e0015b28: Priority Arrows are always disabled for Email.

    * commit 'f82fa85c7a54cf71ccd8d64dcc3657857e872408':
      Priority Arrows are always disabled for Email.

commit f82fa85c7a54cf71ccd8d64dcc3657857e872408
Merge: 86baaba 257fb7a
Author: Vikram Aggarwal <viki@google.com>
Date:   Wed Aug 1 09:53:45 2012 -0700

    am 257fb7ab: am e0015b28: Priority Arrows are always disabled for Email.

    * commit '257fb7ab59de7c8ccaa30ef380daba908da8078c':
      Priority Arrows are always disabled for Email.

commit f0f1f7c161e6fb0ea3682479ceaf92586f4152df
Merge: c80a20c 86baaba
Author: Marc Blank <mblank@google.com>
Date:   Wed Aug 1 09:39:13 2012 -0700

    am 86baabad: am c776b1f1: am 7d5e2a7c: Do "same certificate" checking when using "trust certificates"

    * commit '86baabad4722c63ebf22536701c3f9b0c08f3249':
      Do "same certificate" checking when using "trust certificates"

commit 86baabad4722c63ebf22536701c3f9b0c08f3249
Merge: 2fc3529 c776b1f
Author: Marc Blank <mblank@google.com>
Date:   Wed Aug 1 09:38:03 2012 -0700

    am c776b1f1: am 7d5e2a7c: Do "same certificate" checking when using "trust certificates"

    * commit 'c776b1f14686118f629d555d240e80f1e1d370d9':
      Do "same certificate" checking when using "trust certificates"

commit c80a20c4732018f2bea443dcc666787e8b2a946a
Merge: 64b2c1d 2fc3529
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Jul 31 15:06:08 2012 -0700

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

    * commit '2fc3529613248b28c7e667ecb62f4d0fa6eb7995':

commit 2fc3529613248b28c7e667ecb62f4d0fa6eb7995
Merge: 3573531 2ee8a5a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Jul 31 15:03:50 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ic35bda05bc74219417e28ebc0a75004a76e11fac

commit 64b2c1dc11816516e30f5abedc65ad78c0e251e0
Merge: 40814fc 3573531
Author: Marc Blank <mblank@google.com>
Date:   Tue Jul 31 14:43:47 2012 -0700

    am 35735314: am 1a91fb2c: am 691d4311: Don\'t use STARTTLS if we\'re already using SSL

    * commit '3573531498a130783b74c2204148f4b842d7da35':
      Don't use STARTTLS if we're already using SSL

commit 3573531498a130783b74c2204148f4b842d7da35
Merge: f51d589 1a91fb2
Author: Marc Blank <mblank@google.com>
Date:   Tue Jul 31 14:41:41 2012 -0700

    am 1a91fb2c: am 691d4311: Don\'t use STARTTLS if we\'re already using SSL

    * commit '1a91fb2c180d7b8977bfe381c14591cad1b4111d':
      Don't use STARTTLS if we're already using SSL

commit 40814fc862abc1cf580c4cb273e1f6b4be007e77
Merge: df9da71 f51d589
Author: Marc Blank <mblank@google.com>
Date:   Tue Jul 31 12:49:15 2012 -0700

    am f51d5895: am 13858031: am 942fea3c: Synchronize checkDatabases()

    * commit 'f51d58956c5266854ff9fe91f99be04e3f2c57ca':
      Synchronize checkDatabases()

commit f51d58956c5266854ff9fe91f99be04e3f2c57ca
Merge: 28b1d75 1385803
Author: Marc Blank <mblank@google.com>
Date:   Tue Jul 31 12:47:43 2012 -0700

    am 13858031: am 942fea3c: Synchronize checkDatabases()

    * commit '13858031306ea6fbaaadbd4b02ceae590f894955':
      Synchronize checkDatabases()

commit df9da71a736b3193c243ebbc6c54f64678375df3
Merge: 4cf55bf 28b1d75
Author: Marc Blank <mblank@google.com>
Date:   Tue Jul 31 10:06:00 2012 -0700

    am 28b1d75f: am dbcab3ca: am 949fc3d8: Prevent NPE when the message has been deleted

    * commit '28b1d75f73b5b8ce07e41a0d55513fee9b4e3558':
      Prevent NPE when the message has been deleted

commit 28b1d75f73b5b8ce07e41a0d55513fee9b4e3558
Merge: 7f5a870 dbcab3c
Author: Marc Blank <mblank@google.com>
Date:   Tue Jul 31 10:03:28 2012 -0700

    am dbcab3ca: am 949fc3d8: Prevent NPE when the message has been deleted

    * commit 'dbcab3ca23e4f6f482d74ac962958a4fffc999ee':
      Prevent NPE when the message has been deleted

commit 4cf55bf0de68bdbf062d556a4de922a207733ba8
Merge: 3abbcc8 7f5a870
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Jul 31 08:28:48 2012 -0700

    am 7f5a870d: Recover changes from jb-mr1-dev

    * commit '7f5a870d4f86a32860e50030be08bd44e840ec93':
      Recover changes from jb-mr1-dev

commit 7f5a870d4f86a32860e50030be08bd44e840ec93
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Jul 31 08:04:56 2012 -0700

    Recover changes from jb-mr1-dev

    Change-Id: I4200a246cf170125fdb285aaa45d17bea1de5bca

commit 3abbcc87089b21166a38e41ba6cd250bc1df8fbc
Merge: 7f7fb18 ccbaa71
Author: The Android Automerger <android-build@android.com>
Date:   Mon Jul 30 22:31:35 2012 -0700

    am ccbaa718: resolve conflicts w/fb3ec1a8

    * commit 'ccbaa718552b6f05010b1959275d78b95d1a82ed':

commit ccbaa718552b6f05010b1959275d78b95d1a82ed
Merge: 0834042 fb3ec1a
Author: The Android Automerger <android-build@android.com>
Date:   Mon Jul 30 22:24:23 2012 -0700

    resolve conflicts w/fb3ec1a8

    Change-Id: Ia2bd70734c3dbcf973c897f58db4b9cb565f9141

commit 7f7fb188bdd6e52685586a0aff03843fbe0cd110
Merge: 440b433 0834042
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Jul 30 15:33:13 2012 -0700

    am 08340425: (-s ours) Reconcile with jb-mr1-release

    * commit '08340425b240879b1358732994417b2851cb1087':

commit 440b4335f4aa41b565e923897aadf79bab2fa075
Merge: c55921b 465fdde
Author: Ying Wang <wangying@google.com>
Date:   Mon Jul 30 15:10:30 2012 -0700

    am 465fddea: (-s ours) Import translations. DO NOT MERGE

    * commit '465fddea9ed7c2eeea75e9e33b1f8944bf70e1a4':
      Import translations. DO NOT MERGE

commit 08340425b240879b1358732994417b2851cb1087
Merge: 465fdde 98dd297
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Jul 30 15:10:28 2012 -0700

    Reconcile with jb-mr1-release

    Change-Id: I48428e48aa754bdfa6d8248472bd69607789c509

commit c55921be96b03d70ec4907bc1cc9d20e0514a582
Merge: e646718 3a0c729
Author: Ying Wang <wangying@google.com>
Date:   Mon Jul 30 15:00:02 2012 -0700

    am 3a0c7296: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '3a0c72969c1c2444eca22c85a05072d529940c78':
      Import translations. DO NOT MERGE

commit e64671887fbca2f5a384b349cb03e67ed5926d0b
Merge: 636739e 414fcec
Author: Ying Wang <wangying@google.com>
Date:   Mon Jul 30 14:59:12 2012 -0700

    Merge "Import translations. DO NOT MERGE"

commit 636739ed9d41a6197c538c8bf602fe70d2c92ca3
Merge: 41ff7e2 f986f44
Author: Mindy Pereira <mindyp@google.com>
Date:   Mon Jul 30 13:42:55 2012 -0700

    am f986f44e: Reduced the number of calls that did the same thing in the Folder class.

    * commit 'f986f44ecac2b65fa50dcd8543945ff85d3b2245':
      Reduced the number of calls that did the same thing in the Folder class.

commit 414fceca72a3f6a008be02227efefd4b15719274
Author: Ying Wang <wangying@google.com>
Date:   Mon Jul 30 11:11:14 2012 -0700

    Import translations. DO NOT MERGE

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

commit e270d2fa7a39cee0dd173efd5403a659383bf4b2
Merge: 2688177 e98cdfb
Author: The Android Automerger <android-build@android.com>
Date:   Wed Jul 25 07:49:59 2012 -0700

    merge in master-release history after reset to master

commit e98cdfb8772e448b6280b89f49187d6db7de78eb
Merge: ea56e5e 30f9695
Author: The Android Automerger <android-build@android.com>
Date:   Tue Jul 24 07:49:59 2012 -0700

    merge in master-release history after reset to master

commit 30f9695b5156c665b87b8bd9c73f6444534547d7
Merge: 4ccfc3c fc4829f
Author: The Android Automerger <android-build@android.com>
Date:   Mon Jul 23 07:50:10 2012 -0700

    merge in master-release history after reset to master

commit fc4829f2eab2b985cbc399187e4f2f8f61df4c39
Merge: 4800082 b59015f
Author: The Android Automerger <android-build@android.com>
Date:   Thu Jul 19 16:18:45 2012 -0700

    merge in master-release history after reset to master

commit b59015f1fc89c432a18673478872f772238db323
Merge: 26dfca6 1a12356
Author: The Android Automerger <android-build@android.com>
Date:   Thu Jul 19 09:32:00 2012 -0700

    merge in master-release history after reset to master

commit 1a12356fa4be7bffd6ff8019afa745a2243e942b
Merge: 994fdfe 296ead7
Author: The Android Automerger <android-build@android.com>
Date:   Tue Jul 17 09:12:44 2012 -0700

    merge in master-release history after reset to master

commit 296ead74ccbc5ab223516453baee2b9835a5f3fa
Author: Mindy Pereira <mindyp@google.com>
Date:   Mon Jul 16 14:35:44 2012 -0700

    Account and Folder are both json objects now.

    We dont have a seperate parcelable account and serialized account
    string (for pending and regular intents)

    Fixes b/6805342 Email crash on opening message from notification bar

    Change-Id: I5b310fbafefb8dd82b9e222421fb624703b1676b

Change-Id: I7f7c5f3cc227cc1c951dca150a3ff152a3070876