Squashed commit of the following:

commit 562415552f332d661fab66482569e0b477c6399d
Author: Paul Westbrook <pwestbro@google.com>
Date:   Sat Apr 13 00:51:26 2013 -0700

    Ensure policy notifications are shown

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

    Bug: 8510828
    Change-Id: Ic788c40456e32fec5e7589c4ed2f40e399dd062d

commit dc952b9a042a4b18049de8c7ae13516820b565f2
Merge: 5a478e2 d61fe17
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 13:44:30 2013 -0700

    am d61fe17f: am e0faab0f: am 14367f5b: am 438fa99e: (-s ours) am 68a406b3: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'd61fe17fe45fb261534078d2fa8f2443ce5543f7':

commit d61fe17fe45fb261534078d2fa8f2443ce5543f7
Merge: 458944f e0faab0
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 13:13:35 2013 -0700

    am e0faab0f: am 14367f5b: am 438fa99e: (-s ours) am 68a406b3: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'e0faab0f34c92c098b8725fd3cbfdd0a92b09fd3':

commit e0faab0f34c92c098b8725fd3cbfdd0a92b09fd3
Merge: b2e8a1b 14367f5
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 13:00:42 2013 -0700

    am 14367f5b: am 438fa99e: (-s ours) am 68a406b3: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '14367f5b4041d5a29fdb349e8058ac5ef11d805d':

commit 14367f5b4041d5a29fdb349e8058ac5ef11d805d
Merge: 2fd0058 438fa99
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 12:42:00 2013 -0700

    am 438fa99e: (-s ours) am 68a406b3: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '438fa99e5c16a6a3f77cfc73771ff20421bbe9f2':

commit 438fa99e5c16a6a3f77cfc73771ff20421bbe9f2
Merge: 2fd0058 68a406b
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 12:27:42 2013 -0700

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

    * commit '68a406b3c7caefe439924380694939d828d0d538':

commit 68a406b3c7caefe439924380694939d828d0d538
Merge: f57bb02 8658893
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 12:21:28 2013 -0700

    Reconcile with jb-mr1-release - do not merge

commit 5a478e277818def09b65a47a4d656cd24762bcf0
Author: Ying Wang <wangying@google.com>
Date:   Tue Dec 4 12:23:20 2012 -0800

    Comment out the unused module

    To fix build warning:
    find: `src': No such file or directory

    Change-Id: Iafc99b3b84395ea47fa9615439097b86c9967619

commit d611250c2a899be9ae4c3229e56c7ce12fd2b9a8
Merge: 408e944 458944f
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Nov 26 09:27:17 2012 -0800

    am 458944fd: am b2e8a1b2: am 2fd0058c: Only clear sync error map on success

    * commit '458944fd75bfe5b717102f34205f739f1dcf50e3':
      Only clear sync error map on success

commit 458944fd75bfe5b717102f34205f739f1dcf50e3
Merge: 6974788 b2e8a1b
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Nov 26 09:25:12 2012 -0800

    am b2e8a1b2: am 2fd0058c: Only clear sync error map on success

    * commit 'b2e8a1b23c1e7cd0d12b7429adad023e25438a27':
      Only clear sync error map on success

commit b2e8a1b23c1e7cd0d12b7429adad023e25438a27
Merge: a12b114 2fd0058
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Nov 26 09:23:33 2012 -0800

    am 2fd0058c: Only clear sync error map on success

    * commit '2fd0058c0204b60966a77265e75bfbc471416aa8':
      Only clear sync error map on success

commit 408e944d03b55b2da0ae81e50bd9d0367a8fde6a
Merge: 6f785ea 6974788
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:34:13 2012 -0800

    am 69747880: (-s ours) am a12b114c: am fcc33af6: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit '69747880790a89feb80fe231a814f21b1bc0485e':

commit 69747880790a89feb80fe231a814f21b1bc0485e
Merge: bd815ec a12b114
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:30:12 2012 -0800

    am a12b114c: am fcc33af6: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit 'a12b114c705f8e1c70b83aa354bae00b6ac09f63':

commit a12b114c705f8e1c70b83aa354bae00b6ac09f63
Merge: 8222362 fcc33af
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:24:11 2012 -0800

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

    * commit 'fcc33af67985b14916f6ff5f291248468dca1377':
      Export provider
      Fix directory provider authority name & export provider
      Make sure we send attachments when not smart-forward
      Fix problem w/ all-day event in invitation

commit 6f785ea12297e7464c3bfa8b3074ff0b7fc9c2db
Merge: de25d3a bd815ec
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 31 09:22:52 2012 -0700

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

    * commit 'bd815ec0000ac77ec2a1d1c026d62f194c4ed6ea':

commit bd815ec0000ac77ec2a1d1c026d62f194c4ed6ea
Merge: 9687828 8658893
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 31 09:18:09 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Idbfc92bb061e8331db8daa2a8a61efc6d7a1cee6

commit de25d3a88d8b9dc4f4270eae561b23dab2a3a52d
Merge: 6634361 9687828
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Oct 22 11:24:14 2012 -0700

    am 96878285: am 8222362d: am f57bb027: Simple fix for 7381557

    * commit '968782851b76a1f3734978cb18504c524f46723b':
      Simple fix for 7381557

commit 968782851b76a1f3734978cb18504c524f46723b
Merge: d832219 8222362
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Oct 22 11:21:05 2012 -0700

    am 8222362d: am f57bb027: Simple fix for 7381557

    * commit '8222362db6cfd7bfc475805fba1add4444e1c217':
      Simple fix for 7381557

commit 8222362db6cfd7bfc475805fba1add4444e1c217
Merge: db49a8c f57bb02
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Oct 22 11:18:04 2012 -0700

    am f57bb027: Simple fix for 7381557

    * commit 'f57bb0274cd334a57e643027c4e1d203f6e7e181':
      Simple fix for 7381557

commit 66343615e5b8e91e231dd1433dac00e008e6db24
Merge: 0cf28dc d832219
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Oct 15 07:43:19 2012 -0700

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

    * commit 'd832219fbc7ba878700b1ec289e159563a20e7e1':

commit d832219fbc7ba878700b1ec289e159563a20e7e1
Merge: 990287d 0325193
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Oct 15 07:40:02 2012 -0700

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

    Change-Id: Ib9988ab46fa193d7b67d07fbaf5ac4d58a0408f8

commit 0cf28dc5cc202b9dcca6ec22ba57e1600406cb26
Merge: 35b68a5 990287d
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Oct 12 07:37:19 2012 -0700

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

    * commit '990287dbdc2ba8b85811d6fe20c44c6283aee04b':

commit 990287dbdc2ba8b85811d6fe20c44c6283aee04b
Merge: 84b145b ae0f5d0
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Oct 12 07:31:52 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I8b11105764f62150a9aff92595c672e7fc448b7d

commit 35b68a5ce2474731e3a06ef482069df085f2d6b1
Merge: 311f702 84b145b
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Oct 11 17:54:39 2012 -0700

    am 84b145b9: am db49a8ca: am 2a1209a5: Fix saving contact from Exchange GAL contact

    * commit '84b145b97b0ce934cdf6d16874eb6192cb0c7d25':
      Fix saving contact from Exchange GAL contact

commit 84b145b97b0ce934cdf6d16874eb6192cb0c7d25
Merge: 4da6379 db49a8c
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Oct 11 17:12:00 2012 -0700

    am db49a8ca: am 2a1209a5: Fix saving contact from Exchange GAL contact

    * commit 'db49a8cae65cebfe369f7a2a561a700b682048b2':
      Fix saving contact from Exchange GAL contact

commit db49a8cae65cebfe369f7a2a561a700b682048b2
Merge: 427107a 2a1209a
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Oct 11 12:47:08 2012 -0700

    am 2a1209a5: Fix saving contact from Exchange GAL contact

    * commit '2a1209a5a72e03643d46eff134920ac5a5fbc17d':
      Fix saving contact from Exchange GAL contact

commit 311f70274e7e9a7ca362b810d5238579b914c56c
Merge: 352ae40 4da6379
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 10 09:51:11 2012 -0700

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

    * commit '4da6379559bbe40e7ed28ab454de6ac256ee9a3d':

commit 4da6379559bbe40e7ed28ab454de6ac256ee9a3d
Merge: 9f8346e 92fb55d 43e2be6
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 10 09:45:26 2012 -0700

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

    Change-Id: Ie7f09921561f5f1d52aba6d205cb4ae95be13f70

commit 352ae40dafdd1a5da582eaffe6bc439e9579fca7
Merge: e4e641f 9f8346e
Author: Paul Westbrook <pwestbro@google.com>
Date:   Tue Oct 9 16:40:18 2012 -0700

    am 9f8346e7: am 427107a6: am 4acfe7ed: Fix stack overflow exception

    * commit '9f8346e7a0110864177f1925d7fffc1619767677':
      Fix stack overflow exception

commit 9f8346e7a0110864177f1925d7fffc1619767677
Merge: 3df828a 427107a
Author: Paul Westbrook <pwestbro@google.com>
Date:   Tue Oct 9 16:37:39 2012 -0700

    am 427107a6: am 4acfe7ed: Fix stack overflow exception

    * commit '427107a668f83946ecc6232795e2cea280637af9':
      Fix stack overflow exception

commit 427107a668f83946ecc6232795e2cea280637af9
Merge: 0b0eb37 4acfe7e
Author: Paul Westbrook <pwestbro@google.com>
Date:   Tue Oct 9 16:35:41 2012 -0700

    am 4acfe7ed: Fix stack overflow exception

    * commit '4acfe7ed048f265ce12842476edf07d28f595b87':
      Fix stack overflow exception

commit e4e641fa84956260a443c11b9a3b2c7bbabf2a14
Merge: 534cbf1 3df828a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 9 07:35:47 2012 -0700

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

    * commit '3df828a27a91f22b1329953b473da61d324fd84b':

commit 3df828a27a91f22b1329953b473da61d324fd84b
Merge: 2aa34d4 5da6fa8
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 9 07:30:18 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I9b5f2ad3d27d07d8864797a66ac80e9b375d03f8

commit 534cbf1bfac1869184f7e94cce8acc49b2e245c4
Merge: 9186cd4 2aa34d4
Author: Marc Blank <mblank@google.com>
Date:   Fri Oct 5 22:42:05 2012 -0700

    am 2aa34d47: am 0b0eb370: am a5afc70e: Try to fix LGE crash bug

    * commit '2aa34d47b9c183d2da7c3f9555695bf22397cfd3':
      Try to fix LGE crash bug

commit 2aa34d47b9c183d2da7c3f9555695bf22397cfd3
Merge: d872c95 0b0eb37
Author: Marc Blank <mblank@google.com>
Date:   Fri Oct 5 22:39:58 2012 -0700

    am 0b0eb370: am a5afc70e: Try to fix LGE crash bug

    * commit '0b0eb3703657999a34f8c15cab2a8598f5e0242c':
      Try to fix LGE crash bug

commit 0b0eb3703657999a34f8c15cab2a8598f5e0242c
Merge: 190201b a5afc70
Author: Marc Blank <mblank@google.com>
Date:   Fri Oct 5 22:38:38 2012 -0700

    am a5afc70e: Try to fix LGE crash bug

    * commit 'a5afc70e49ada08e7572be51fc48323ef1c6f6a8':
      Try to fix LGE crash bug

commit 9186cd4ca16ef58bdb629041183bc6085d25068e
Merge: 6740a00 d872c95
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 28 13:48:31 2012 -0700

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

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

commit d872c951778f00c352cd40c55c8636ee4c1eccf6
Merge: 789bb58 190201b
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Sep 28 13:45:24 2012 -0700

    Merge from jb-mr1-aah-dev

    Change-Id: If78b5aa1133c09087dc9dbd58324d3fa6242a7ef

commit 6740a00af6b1f9100a49b520607a703b40166932
Merge: acd32a4 789bb58
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Sep 28 00:32:48 2012 -0700

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

    * commit '789bb583f7026b6f0cfd0ba71fa4505dc5406b60':
      Export provider

commit 789bb583f7026b6f0cfd0ba71fa4505dc5406b60
Merge: a695917 2e67daa
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 27 09:58:55 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Id3d9f024e920889d70a2e6f933f92eabb01dc972

commit acd32a4e92249f1cdbe4caaa7dc9b9483ab86f49
Merge: ae7750c a695917
Author: Vikram Aggarwal <viki@google.com>
Date:   Wed Sep 26 16:16:47 2012 -0700

    am a695917d: am 7da5a064: Merge "Rename USER_QUERY -> LIVE_QUERY" into jb-mr1-dev

    * commit 'a695917dcfec326512921259fe30bb944433526d':
      Rename USER_QUERY -> LIVE_QUERY

commit 190201be22d0657b7408b89f90b7fd206c57a564
Merge: 7853eb7 7da5a06
Author: Vikram Aggarwal <viki@google.com>
Date:   Wed Sep 26 16:14:39 2012 -0700

    am 7da5a064: Merge "Rename USER_QUERY -> LIVE_QUERY" into jb-mr1-dev

    * commit '7da5a06453e93779c4bcd66d7175cd4272d65f5e':
      Rename USER_QUERY -> LIVE_QUERY

commit a695917dcfec326512921259fe30bb944433526d
Merge: 1a53b7e 7da5a06
Author: Vikram Aggarwal <viki@google.com>
Date:   Wed Sep 26 16:14:39 2012 -0700

    am 7da5a064: Merge "Rename USER_QUERY -> LIVE_QUERY" into jb-mr1-dev

    * commit '7da5a06453e93779c4bcd66d7175cd4272d65f5e':
      Rename USER_QUERY -> LIVE_QUERY

commit ae7750c3efa72835303769601f68864bd5e6e208
Merge: 3b374c1 1a53b7e
Author: Mindy Pereira <mindyp@google.com>
Date:   Wed Sep 26 13:26:18 2012 -0700

    am 1a53b7ee: am 5b31253f: Revert "cherrypick: Check for duplicated mailboxes and correct if found"

    * commit '1a53b7eecd584a7636cb1371aa9118a921189b0c':
      Revert "cherrypick: Check for duplicated mailboxes and correct if found"

commit 7853eb719e4dc0319aca8b9326c9e7a4b2bc1e15
Merge: ca346d6 5b31253
Author: Mindy Pereira <mindyp@google.com>
Date:   Wed Sep 26 13:24:06 2012 -0700

    am 5b31253f: Revert "cherrypick: Check for duplicated mailboxes and correct if found"

    * commit '5b31253fe29bb22bbcfa12f83adab6bba72f00b9':
      Revert "cherrypick: Check for duplicated mailboxes and correct if found"

commit 1a53b7eecd584a7636cb1371aa9118a921189b0c
Merge: 30e6cd9 5b31253
Author: Mindy Pereira <mindyp@google.com>
Date:   Wed Sep 26 13:23:55 2012 -0700

    am 5b31253f: Revert "cherrypick: Check for duplicated mailboxes and correct if found"

    * commit '5b31253fe29bb22bbcfa12f83adab6bba72f00b9':
      Revert "cherrypick: Check for duplicated mailboxes and correct if found"

commit 3b374c13f3970cf71c9462da86b7310eb71d3118
Merge: 9274659 30e6cd9
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 26 13:12:17 2012 -0700

    am 30e6cd9f: am d149d004: cherrypick: Don\'t reset account sync key from 0 when folders are bad

    * commit '30e6cd9f6584ba4a866397dab692ca82a2252ab7':
      cherrypick: Don't reset account sync key from 0 when folders are bad

commit ca346d6050761ef856024dba8d6684d32c952178
Merge: ae15126 d149d00
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 26 13:10:56 2012 -0700

    am d149d004: cherrypick: Don\'t reset account sync key from 0 when folders are bad

    * commit 'd149d004f0f8535b8a140678fd50e3ee4df1e756':
      cherrypick: Don't reset account sync key from 0 when folders are bad

commit 30e6cd9f6584ba4a866397dab692ca82a2252ab7
Merge: 4c18692 d149d00
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 26 13:10:48 2012 -0700

    am d149d004: cherrypick: Don\'t reset account sync key from 0 when folders are bad

    * commit 'd149d004f0f8535b8a140678fd50e3ee4df1e756':
      cherrypick: Don't reset account sync key from 0 when folders are bad

commit 9274659b515943e8405ae69403d9a5d96efbe2f5
Merge: f35709d 4c18692
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 26 13:04:15 2012 -0700

    am 4c186927: am 75437ce8: Merge "cherrypick: Check for duplicated mailboxes and correct if found" into jb-mr1-dev

    * commit '4c18692772234aff1d27c0d8c604c5099c3b2774':
      cherrypick: Check for duplicated mailboxes and correct if found

commit 4c18692772234aff1d27c0d8c604c5099c3b2774
Merge: e78c6a6 75437ce
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 26 13:02:42 2012 -0700

    am 75437ce8: Merge "cherrypick: Check for duplicated mailboxes and correct if found" into jb-mr1-dev

    * commit '75437ce8f4373862a930c8e1bac4acc0156cb561':
      cherrypick: Check for duplicated mailboxes and correct if found

commit ae15126cd6a1f99ab003407f6bcb5954d4402aa8
Merge: 25041d6 75437ce
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 26 13:02:29 2012 -0700

    am 75437ce8: Merge "cherrypick: Check for duplicated mailboxes and correct if found" into jb-mr1-dev

    * commit '75437ce8f4373862a930c8e1bac4acc0156cb561':
      cherrypick: Check for duplicated mailboxes and correct if found

commit f35709d981f231cc47a101662b0ab890a4f21025
Merge: 1daf8cc e78c6a6
Author: Mindy Pereira <mindyp@google.com>
Date:   Wed Sep 26 12:58:18 2012 -0700

    am e78c6a6d: am d661f214: Merge "cherrypick:Fix longstanding EAS battery burner" into jb-mr1-dev

    * commit 'e78c6a6d756334a7c273cafdac0aadb54ba733cb':
      cherrypick:Fix longstanding EAS battery burner

commit e78c6a6d756334a7c273cafdac0aadb54ba733cb
Merge: b4799e0 d661f21
Author: Mindy Pereira <mindyp@google.com>
Date:   Wed Sep 26 12:56:06 2012 -0700

    am d661f214: Merge "cherrypick:Fix longstanding EAS battery burner" into jb-mr1-dev

    * commit 'd661f214c7a9a6142dff2d03944510aa5e6ee200':
      cherrypick:Fix longstanding EAS battery burner

commit 25041d6aac24eb2ce32cf96491dfc975f56e7d0a
Merge: ff16be5 d661f21
Author: Mindy Pereira <mindyp@google.com>
Date:   Wed Sep 26 12:55:54 2012 -0700

    am d661f214: Merge "cherrypick:Fix longstanding EAS battery burner" into jb-mr1-dev

    * commit 'd661f214c7a9a6142dff2d03944510aa5e6ee200':
      cherrypick:Fix longstanding EAS battery burner

commit 1daf8cc9baa228d870cd12c85380860a25033893
Merge: 88356a4 b4799e0
Author: Mindy Pereira <mindyp@google.com>
Date:   Wed Sep 26 12:52:23 2012 -0700

    am b4799e09: am 27888de1: Merge "cherrypick: Try to use names from time zone strings if all else fails..." into jb-mr1-dev

    * commit 'b4799e09382903f2faece13199c3283a2e2960a4':
      cherrypick: Try to use names from time zone strings if all else fails...

commit 88356a494264c6936c9b9f016cafa4a5a988a211
Merge: 6babb8a 1070edc
Author: Mindy Pereira <mindyp@google.com>
Date:   Wed Sep 26 12:50:52 2012 -0700

    am 1070edc5: am 950435bb: Merge "cherry pick: Fix potential looping issue" into jb-mr1-dev

    * commit '1070edc57c3dba9e8b550f61c520de21023f1c08':
      cherry pick: Fix potential looping issue

commit ff16be5f993f60673a4f8af719d8024039ef643f
Merge: dd40daf 27888de
Author: Mindy Pereira <mindyp@google.com>
Date:   Wed Sep 26 12:50:24 2012 -0700

    am 27888de1: Merge "cherrypick: Try to use names from time zone strings if all else fails..." into jb-mr1-dev

    * commit '27888de1039840e8a4c64b11d1d66f07369968a2':
      cherrypick: Try to use names from time zone strings if all else fails...

commit b4799e09382903f2faece13199c3283a2e2960a4
Merge: 1070edc 27888de
Author: Mindy Pereira <mindyp@google.com>
Date:   Wed Sep 26 12:50:14 2012 -0700

    am 27888de1: Merge "cherrypick: Try to use names from time zone strings if all else fails..." into jb-mr1-dev

    * commit '27888de1039840e8a4c64b11d1d66f07369968a2':
      cherrypick: Try to use names from time zone strings if all else fails...

commit 6babb8a67291d793d77478d38bab2a6795576612
Merge: e720c07 9a3bdcb
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 26 12:49:24 2012 -0700

    am 9a3bdcb7: am c621d4ec: Merge "Export provider" into jb-mr1-dev

    * commit '9a3bdcb79337f8119397545f77588b1923db71b5':
      Export provider

commit dd40daf43241395f7d716894a0606768f098ea09
Merge: afc4927 950435b
Author: Mindy Pereira <mindyp@google.com>
Date:   Wed Sep 26 12:48:59 2012 -0700

    am 950435bb: Merge "cherry pick: Fix potential looping issue" into jb-mr1-dev

    * commit '950435bbc287194887733d34aa531bc0bb527981':
      cherry pick: Fix potential looping issue

commit 1070edc57c3dba9e8b550f61c520de21023f1c08
Merge: 9a3bdcb 950435b
Author: Mindy Pereira <mindyp@google.com>
Date:   Wed Sep 26 12:48:45 2012 -0700

    am 950435bb: Merge "cherry pick: Fix potential looping issue" into jb-mr1-dev

    * commit '950435bbc287194887733d34aa531bc0bb527981':
      cherry pick: Fix potential looping issue

commit afc492755bbeea67bd40ba3e4d36190097285b02
Merge: c0dcb12 c621d4e
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 26 12:47:33 2012 -0700

    am c621d4ec: Merge "Export provider" into jb-mr1-dev

    * commit 'c621d4ec717b6fd2548ec44559e30fe40e2085ec':
      Export provider

commit 9a3bdcb79337f8119397545f77588b1923db71b5
Merge: 0d3c22f c621d4e
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 26 12:47:16 2012 -0700

    am c621d4ec: Merge "Export provider" into jb-mr1-dev

    * commit 'c621d4ec717b6fd2548ec44559e30fe40e2085ec':
      Export provider

commit c0dcb127430ac653cae6ab6b8ce498bc06105237
Merge: fc95d56 18bb75c
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 26 12:42:09 2012 -0700

    am 18bb75cd: Cherrypick: Sigh; new events aren\'t modifiable on the server

    * commit '18bb75cdd66c14113e179e472a92b21b37de4644':
      Cherrypick: Sigh; new events aren't modifiable on the server

commit e720c07f5a65a94d83793d45983c89c88ead1318
Merge: b0d9c1b 0d3c22f
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 26 12:42:05 2012 -0700

    am 0d3c22f4: am 18bb75cd: Cherrypick: Sigh; new events aren\'t modifiable on the server

    * commit '0d3c22f4f73c036a166014570ff3f7353f96c6aa':
      Cherrypick: Sigh; new events aren't modifiable on the server

commit 0d3c22f4f73c036a166014570ff3f7353f96c6aa
Merge: 362df40 18bb75c
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 26 12:40:53 2012 -0700

    am 18bb75cd: Cherrypick: Sigh; new events aren\'t modifiable on the server

    * commit '18bb75cdd66c14113e179e472a92b21b37de4644':
      Cherrypick: Sigh; new events aren't modifiable on the server

commit b0d9c1b684f2ffeb702b228aaf9ab1575bad4f76
Merge: 6a44ef0 362df40
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 26 10:08:12 2012 -0700

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

    * commit '362df407911c2e6ed42e66fe2981cdb65c1e08ad':

commit 362df407911c2e6ed42e66fe2981cdb65c1e08ad
Merge: f2419ef eb2a044
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 26 09:08:01 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I99d711824a1f7a977fce2a4f991f4615bd7b0eec

commit 6a44ef0c822f4b7cd1213b6a9b2de67258f4e0bc
Merge: 4a47d73 f2419ef
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Sep 25 15:34:08 2012 -0700

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

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

commit f2419ef799f1da0c27d25dad16b51c4659c81255
Merge: 6a4cf5b f99e839
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Sep 25 14:28:33 2012 -0700

    am f99e8395: Import translations. DO NOT MERGE

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

commit fc95d56ab71b7b872129f4f257f9eaa0c1aa6ae1
Merge: 44de26e f99e839
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Sep 25 14:27:56 2012 -0700

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

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

commit 4a47d73b1cb466ef8c9b72be445294038002ad19
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Sep 25 12:27:46 2012 -0700

    Import translations. DO NOT MERGE

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

commit 44de26efa4e014a43b62a13659831677dde5ae4e
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Sep 25 12:25:22 2012 -0700

    Import translations. DO NOT MERGE

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

commit 707a214c26aa515b59401401a032aa947f3efd1b
Merge: 9c127e9 6a4cf5b
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Sep 24 23:05:30 2012 -0700

    am 6a4cf5b3: am b931f82f: Restore MRO\'s Exchange

    * commit '6a4cf5b36ba36d5042e2b824bdfd40d827484db8':
      Restore MRO's Exchange

commit 9202bba665f2d06b005fbe0d035d54a6f2fef036
Merge: 7aa890b b931f82
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Sep 24 22:24:02 2012 -0700

    am b931f82f: Restore MRO\'s Exchange

    * commit 'b931f82fa44c2e26e2645c0d5fde9eef3e666efd':
      Restore MRO's Exchange

commit 6a4cf5b36ba36d5042e2b824bdfd40d827484db8
Merge: 6f548e2 b931f82
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Sep 24 22:23:57 2012 -0700

    am b931f82f: Restore MRO\'s Exchange

    * commit 'b931f82fa44c2e26e2645c0d5fde9eef3e666efd':
      Restore MRO's Exchange

commit 9c127e9586084e1a9c05121bf189dda53c046979
Merge: ee83436 6f548e2
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Sep 24 10:18:37 2012 -0700

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

    * commit '6f548e26f5742639e286178a8b3309d57aa2e057':

commit 6f548e26f5742639e286178a8b3309d57aa2e057
Merge: a06dec0 b96c48f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Sep 24 10:13:08 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: If32c28ca7dce210a1dd5f5337743e5e5a6d1ae7a

commit 7aa890b90ef89355da92e724bb3f636ca922841e
Merge: 2228606 7f3ecdf
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 21 17:45:37 2012 -0700

    am 7f3ecdf6: (-s ours) am 2b0a9de6: (-s ours) Import translations. DO NOT MERGE

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

commit 222860644e024c7f4382a356d6cc5726a6368f29
Merge: 182a8a4 5998aa5
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 21 17:45:29 2012 -0700

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

    * commit '5998aa5b0a2d3ae1837b754aaa5443ec0d4a2283':
      Import translations. DO NOT MERGE

commit ee83436ad0538ce6e46d69a2544389bdb613d3d0
Merge: 5264840 a06dec0
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 21 12:44:20 2012 -0700

    am a06dec0b: (-s ours) am 7f3ecdf6: am 2b0a9de6: (-s ours) Import translations. DO NOT MERGE

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

commit 52648407a6738f307147832894e9c0d2b694c3c0
Merge: a1e83e6 668d676
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 21 12:44:13 2012 -0700

    am 668d6762: (-s ours) am 5998aa5b: Import translations. DO NOT MERGE

    * commit '668d67624f3b1e647fc0da8931027c15087e18cc':
      Import translations. DO NOT MERGE

commit a06dec0ba767e5a387cbb2552c4abc616a833289
Merge: 668d676 7f3ecdf
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 21 07:35:52 2012 -0700

    am 7f3ecdf6: am 2b0a9de6: (-s ours) Import translations. DO NOT MERGE

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

commit 668d67624f3b1e647fc0da8931027c15087e18cc
Merge: 4ab3671 5998aa5
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 21 07:31:18 2012 -0700

    am 5998aa5b: Import translations. DO NOT MERGE

    * commit '5998aa5b0a2d3ae1837b754aaa5443ec0d4a2283':
      Import translations. DO NOT MERGE

commit a1e83e6b966321afcca12fd9bca9f09ab655a28c
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 20 15:01:29 2012 -0700

    Import translations. DO NOT MERGE

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

commit 182a8a4bc95707644f519ed6f726b75ff75f9838
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 20 14:59:31 2012 -0700

    Import translations. DO NOT MERGE

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

commit f99f6f4929e2ee45e7e0c3998be87eeff7e5c907
Merge: 62bc4e5 4ab3671
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 20 12:52:44 2012 -0700

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

    * commit '4ab3671c4ffc89733d40aa166ec173b450e5cafd':
      Fix directory provider authority name & export provider
      Make sure we send attachments when not smart-forward

commit 4ab3671c4ffc89733d40aa166ec173b450e5cafd
Merge: bed7740 fe30fc9
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 20 10:36:36 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I46d683c0e9113194c827ae32129f3ab38b7aed48

commit 62bc4e542e1166ffc09b31c2f68d97468c10885d
Merge: f62eacd bed7740
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Sep 20 09:35:46 2012 -0700

    am bed77402: am 16ff8677: am 74af6f19: increment versionCode

    * commit 'bed77402ea3a633758d09f80e0870d542f6fb1a3':
      increment versionCode

commit c09519b090bc950178136bdb9c53279950116f52
Merge: 7e3b786 16ff867
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Sep 20 09:06:31 2012 -0700

    am 16ff8677: am 74af6f19: increment versionCode

    * commit '16ff8677ccbe4ed7a27bc4b4701fa8c65d8bbb84':
      increment versionCode

commit bed77402ea3a633758d09f80e0870d542f6fb1a3
Merge: aa7d065 16ff867
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Sep 20 09:03:10 2012 -0700

    am 16ff8677: am 74af6f19: increment versionCode

    * commit '16ff8677ccbe4ed7a27bc4b4701fa8c65d8bbb84':
      increment versionCode

commit 7e3b786ddbe322fc2902994fb84b14ac5928e3aa
Merge: 4418eda f37d8c4
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 20 06:21:28 2012 -0700

    am f37d8c4d: am 5e87f84d: Add translatable="false" as appropriate

    * commit 'f37d8c4dd8e426f63b2fd9a2fc1b089864d1b93c':
      Add translatable="false" as appropriate

commit f62eacdc1818129cbe8f3aee0023208226b378c6
Merge: 70371e7 aa7d065
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 20 06:18:53 2012 -0700

    am aa7d0657: am f37d8c4d: am 5e87f84d: Add translatable="false" as appropriate

    * commit 'aa7d0657a01215d1306cd4a4fa4d8e0885d8b319':
      Add translatable="false" as appropriate

commit aa7d0657a01215d1306cd4a4fa4d8e0885d8b319
Merge: 036d1aa f37d8c4
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 20 06:07:38 2012 -0700

    am f37d8c4d: am 5e87f84d: Add translatable="false" as appropriate

    * commit 'f37d8c4dd8e426f63b2fd9a2fc1b089864d1b93c':
      Add translatable="false" as appropriate

commit 70371e7515cfaca312cb125d9fd8145585951c20
Merge: 9eea974 036d1aa
Author: Paul Westbrook <pwestbro@google.com>
Date:   Wed Sep 19 15:18:11 2012 -0700

    am 036d1aa3: am 68e8e41d: am 54cd29e0: increment versionCode

    * commit '036d1aa31dc663459e70ea5e81b4f18b6d252bd8':
      increment versionCode

commit 4418eda134ab591081bcd9632b6383f6a80a49a8
Merge: 16df1ca c981676
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Sep 19 09:47:31 2012 -0700

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

commit 16df1cac1557dfe809ce61c6e752f53f73c7ee5e
Merge: 496b1ad 68e8e41
Author: Paul Westbrook <pwestbro@google.com>
Date:   Tue Sep 18 18:34:48 2012 -0700

    am 68e8e41d: am 54cd29e0: increment versionCode

    * commit '68e8e41de2d3e8dae8c850932e40b92aa4985590':
      increment versionCode

commit 036d1aa31dc663459e70ea5e81b4f18b6d252bd8
Merge: 08e5afd 68e8e41
Author: Paul Westbrook <pwestbro@google.com>
Date:   Tue Sep 18 18:29:32 2012 -0700

    am 68e8e41d: am 54cd29e0: increment versionCode

    * commit '68e8e41de2d3e8dae8c850932e40b92aa4985590':
      increment versionCode

commit c98167601972fddbb69859804e20cc04a4d29c13
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Sep 18 09:18:13 2012 -0700

    Import translations. DO NOT MERGE

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

commit 9eea974f8664914d2f552c106a3925fe8d26697e
Merge: 78744f8 08e5afd
Author: Paul Westbrook <pwestbro@google.com>
Date:   Tue Sep 18 00:10:57 2012 -0700

    am 08e5afdd: am e12ce3ec: am f1cb3d6b: increment versionCode

    * commit '08e5afdd277af6cbcaa5f27e841d98b962afdad3':
      increment versionCode

commit 08e5afdd277af6cbcaa5f27e841d98b962afdad3
Merge: e97690f e12ce3e
Author: Paul Westbrook <pwestbro@google.com>
Date:   Tue Sep 18 00:04:48 2012 -0700

    am e12ce3ec: am f1cb3d6b: increment versionCode

    * commit 'e12ce3ec04688aa49942b0a4ce79d9563a420155':
      increment versionCode

commit 496b1ad19033e7a7cf1f38cc29ce9c7842777f60
Merge: a5ab9ad e12ce3e
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Sep 17 21:12:06 2012 -0700

    am e12ce3ec: am f1cb3d6b: increment versionCode

    * commit 'e12ce3ec04688aa49942b0a4ce79d9563a420155':
      increment versionCode

commit 78744f8f749b31f6804d3ee649f557694404800c
Merge: 78f6c6d e97690f
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 17 14:55:03 2012 -0700

    am e97690fa: am 29ad084e: am 59730a4a: Fix directory provider authority name & export provider

    * commit 'e97690fa9038b8cc51a10c515cb4bfdbbdd7e0cb':
      Fix directory provider authority name & export provider

commit 78f6c6da4451f9fa1eb31393b20c89e558ec50cd
Merge: eebee2e adc21f5
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 17 14:52:42 2012 -0700

    am adc21f5c: am 1aaff0d4: am 045e94a5: Merge "Make sure we send attachments when not smart-forward" into jb-ub-mail

    * commit 'adc21f5c0aa9c7fcbe8a443fffec1e7a6a85b933':
      Make sure we send attachments when not smart-forward

commit eebee2e24a637c9ece09be2b70cecf7169539a09
Merge: 4e2a757 94d039d
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 17 14:46:30 2012 -0700

    am 94d039dc: am 798c92b9: am 6a5c3435: Merge "Let Exchange run on ICS+" into jb-ub-mail

    * commit '94d039dc3c391c2a55fa67e0dd41ba5ded94732e':
      Let Exchange run on ICS+

commit 4e2a757251516f53f1b85601b3a2fd13092b6ab9
Merge: 5d8c96a 5f5b7ff
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 17 14:44:00 2012 -0700

    am 5f5b7ff6: am a94b7e6e: am 7f29df6b: Revert "Initialize matcher in onCreate()"

    * commit '5f5b7ff6054c266bbdb9eacad88861197402c708':
      Revert "Initialize matcher in onCreate()"

commit 5d8c96a7221af88504c163f82103736babca4411
Merge: 5298f83 0a46860
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 17 14:43:59 2012 -0700

    am 0a468603: am 3f99d800: am 8012f8c0: Initialize matcher in onCreate()

    * commit '0a468603e8a72744e8cb59588cb277348ddba1bd':
      Initialize matcher in onCreate()

commit 5298f832a65996d5c4562ba1859e0374855beba7
Merge: 58902bd ae251ac
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 17 14:43:43 2012 -0700

    am ae251ac6: am e1d42a68: am d5ce27c8: Merge "Properly handle smart-forwarded attachments" into jb-ub-mail

    * commit 'ae251ac62af9333eac3cf110d46774355c723008':
      Properly handle smart-forwarded attachments

commit a5ab9ad8b64491f532bb06b487906a8a15a0ca35
Merge: bdc960e 29ad084
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 17 14:24:39 2012 -0700

    am 29ad084e: am 59730a4a: Fix directory provider authority name & export provider

    * commit '29ad084e54f15229876491eecf9d8a0b0375f94f':
      Fix directory provider authority name & export provider

commit e97690fa9038b8cc51a10c515cb4bfdbbdd7e0cb
Merge: adc21f5 29ad084
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 17 14:24:19 2012 -0700

    am 29ad084e: am 59730a4a: Fix directory provider authority name & export provider

    * commit '29ad084e54f15229876491eecf9d8a0b0375f94f':
      Fix directory provider authority name & export provider

commit 58902bde8f611e0ac0db00bd51e4d9b487d33ca4
Merge: 5a416fc 8de8181
Author: mindyp <mindyp@google.com>
Date:   Mon Sep 17 10:28:50 2012 -0700

    am 8de81818: am 73e9ec5b: am 976e98bf: Lib has been renamed to calendar2; fix build

    * commit '8de818187450fb672c067213cd52a8d3a3a54b4c':
      Lib has been renamed to calendar2; fix build

commit bdc960e51c50f2d292c71c91520aba88a5422767
Merge: 1c898d1 1aaff0d
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 17 08:27:23 2012 -0700

    am 1aaff0d4: am 045e94a5: Merge "Make sure we send attachments when not smart-forward" into jb-ub-mail

    * commit '1aaff0d4b7dd53de22c0c698046ea0c22103f84c':
      Make sure we send attachments when not smart-forward

commit adc21f5c0aa9c7fcbe8a443fffec1e7a6a85b933
Merge: 94d039d 1aaff0d
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 17 08:27:09 2012 -0700

    am 1aaff0d4: am 045e94a5: Merge "Make sure we send attachments when not smart-forward" into jb-ub-mail

    * commit '1aaff0d4b7dd53de22c0c698046ea0c22103f84c':
      Make sure we send attachments when not smart-forward

commit 94d039dc3c391c2a55fa67e0dd41ba5ded94732e
Merge: 5f5b7ff 798c92b
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 17 08:25:37 2012 -0700

    am 798c92b9: am 6a5c3435: Merge "Let Exchange run on ICS+" into jb-ub-mail

    * commit '798c92b9343ff144590534155226c5c8ffe709f5':
      Let Exchange run on ICS+

commit 1c898d1195e8a074c4666c691d02b40e3d39ade4
Merge: 7b10cbd 798c92b
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 17 08:24:35 2012 -0700

    am 798c92b9: am 6a5c3435: Merge "Let Exchange run on ICS+" into jb-ub-mail

    * commit '798c92b9343ff144590534155226c5c8ffe709f5':
      Let Exchange run on ICS+

commit 7b10cbd5166d1b456f205e043549f0aa2183c789
Merge: a078d46 a94b7e6
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 15 19:07:45 2012 -0700

    am a94b7e6e: am 7f29df6b: Revert "Initialize matcher in onCreate()"

    * commit 'a94b7e6e613fe0149974ace2614aabcd020bd80d':
      Revert "Initialize matcher in onCreate()"

commit 5f5b7ff6054c266bbdb9eacad88861197402c708
Merge: 0a46860 a94b7e6
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 15 19:07:39 2012 -0700

    am a94b7e6e: am 7f29df6b: Revert "Initialize matcher in onCreate()"

    * commit 'a94b7e6e613fe0149974ace2614aabcd020bd80d':
      Revert "Initialize matcher in onCreate()"

commit a078d46d729b0530fd702123d2cc87340a7cbc35
Merge: b79a8a0 3f99d80
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 15 19:00:03 2012 -0700

    am 3f99d800: am 8012f8c0: Initialize matcher in onCreate()

    * commit '3f99d800108b7255408a0a890a14390221314aca':
      Initialize matcher in onCreate()

commit 0a468603e8a72744e8cb59588cb277348ddba1bd
Merge: ae251ac 3f99d80
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 15 18:59:58 2012 -0700

    am 3f99d800: am 8012f8c0: Initialize matcher in onCreate()

    * commit '3f99d800108b7255408a0a890a14390221314aca':
      Initialize matcher in onCreate()

commit b79a8a0a877291bbfe5a99d5e6c48a2c2afed55f
Merge: 5031208 e1d42a6
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 15 16:12:33 2012 -0700

    am e1d42a68: am d5ce27c8: Merge "Properly handle smart-forwarded attachments" into jb-ub-mail

    * commit 'e1d42a6821d65b4cbf3969aa5a95036d0b0b0dc2':
      Properly handle smart-forwarded attachments

commit ae251ac62af9333eac3cf110d46774355c723008
Merge: 8de8181 e1d42a6
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 15 16:12:14 2012 -0700

    am e1d42a68: am d5ce27c8: Merge "Properly handle smart-forwarded attachments" into jb-ub-mail

    * commit 'e1d42a6821d65b4cbf3969aa5a95036d0b0b0dc2':
      Properly handle smart-forwarded attachments

commit 5031208283cf8b4c94ab66b2e48f412ae1863133
Merge: 4224205 73e9ec5
Author: mindyp <mindyp@google.com>
Date:   Fri Sep 14 11:25:39 2012 -0700

    am 73e9ec5b: am 976e98bf: Lib has been renamed to calendar2; fix build

    * commit '73e9ec5b65d020c4e5388799e3281878465bcf5a':
      Lib has been renamed to calendar2; fix build

commit 8de818187450fb672c067213cd52a8d3a3a54b4c
Merge: 89f0b6e 73e9ec5
Author: mindyp <mindyp@google.com>
Date:   Fri Sep 14 11:25:25 2012 -0700

    am 73e9ec5b: am 976e98bf: Lib has been renamed to calendar2; fix build

    * commit '73e9ec5b65d020c4e5388799e3281878465bcf5a':
      Lib has been renamed to calendar2; fix build

commit 5a416fc0a7e4b3e9642d3f74ea69a7a60030d440
Merge: dff3663 89f0b6e
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 14 10:30:17 2012 -0700

    am 89f0b6e2: (-s ours) am 285163e0: am f4fd55cf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '89f0b6e2bd2e74638d8f569707ccdf61fcf0025e':
      Import translations. DO NOT MERGE

commit dff3663cc27f77fad7029c355e7cb4ec75140b73
Merge: 2b5e84b f2e07ea
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 14 10:30:08 2012 -0700

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

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

commit 2b5e84b7e4450dd204d202c1715e7f610658e974
Merge: f33ce78 8e1ddb4
Author: mindyp <mindyp@google.com>
Date:   Fri Sep 14 10:29:03 2012 -0700

    am 8e1ddb44: am 798807ec: am 7a4181e7: Bump version code

    * commit '8e1ddb44d47e784dcb11e34547b4d61d99802647':
      Bump version code

commit 89f0b6e2bd2e74638d8f569707ccdf61fcf0025e
Merge: f2e07ea 285163e
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 13 21:19:05 2012 -0700

    am 285163e0: am f4fd55cf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '285163e0258d41cce1ad2a3479058b21c880e0bf':
      Import translations. DO NOT MERGE

commit 42242059ba00b977b9816c3e5b94e9a48894c2d1
Merge: 1d2a9dd 285163e
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 13 21:18:46 2012 -0700

    am 285163e0: (-s ours) am f4fd55cf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '285163e0258d41cce1ad2a3479058b21c880e0bf':
      Import translations. DO NOT MERGE

commit 1d2a9dd68b2e8f358fc7e6dd750697b12adc6b4e
Merge: 048b864 9950278
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 13 20:18:07 2012 -0700

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

    * commit '99502781cb8af95f32d9c351998148d8a1679c96':
      Import translations. DO NOT MERGE

commit f2e07eac909e0abf611794aea56cd51e7ca3845c
Merge: 8e1ddb4 9950278
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 13 20:17:29 2012 -0700

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

    * commit '99502781cb8af95f32d9c351998148d8a1679c96':
      Import translations. DO NOT MERGE

commit 048b864d93f6f30b9d139239e666860d9ca73a49
Merge: 3bd1b43 798807e
Author: mindyp <mindyp@google.com>
Date:   Thu Sep 13 18:11:45 2012 -0700

    am 798807ec: am 7a4181e7: Bump version code

    * commit '798807ec870d4516e4255ae52b25b59d56eb60f0':
      Bump version code

commit 8e1ddb44d47e784dcb11e34547b4d61d99802647
Merge: 6f3b48e 798807e
Author: mindyp <mindyp@google.com>
Date:   Thu Sep 13 18:11:34 2012 -0700

    am 798807ec: am 7a4181e7: Bump version code

    * commit '798807ec870d4516e4255ae52b25b59d56eb60f0':
      Bump version code

commit f33ce785a1f7282b299cad5264e02fadb20acfe9
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 13 11:04:46 2012 -0700

    Import translations. DO NOT MERGE

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

commit cb7626c6eeac93f2f50212921004f4a8eb7f5ab5
Merge: d206123 6f3b48e
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 12 16:59:07 2012 -0700

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

    * commit '6f3b48e4e4d15fc248296d95120dd1b6d16e592d':

commit d2061235ef614c52c4f6002d3a7a79b9631a4d08
Merge: 160149d 1d17a72
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 12 15:28:16 2012 -0700

    am 1d17a724: am e8e7b38a: am 4feac159: Oops

    * commit '1d17a724c7dab0e9247692971e4b7901cf11fc31':
      Oops

commit 160149d0dfb396c96016d05cb759a88e9ba9b628
Merge: ef870e6 add6164
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 12 15:28:13 2012 -0700

    am add61642: am 45f742ec: am acf857c8: Merge "Initialize EmailContent in onCreate()" into jb-ub-mail

    * commit 'add61642d77354455b882ad568343cd5f366eab9':
      Initialize EmailContent in onCreate()

commit ef870e6d0d71c87bb02aebef3c5a810e3ead7187
Merge: b782f56 c790df1
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 12 15:14:13 2012 -0700

    am c790df1a: am 234fff58: am 57f30d49: Sigh; new events aren\'t modifiable on the server

    * commit 'c790df1a342399241099dcda4cc36a631868b92e':
      Sigh; new events aren't modifiable on the server

commit b782f56451f065115bab8158e76b54de57ae83ef
Merge: 1a2fb1b 806d0ad
Author: Marc Blank <mblank@google.com>
Date:   Wed Sep 12 13:18:29 2012 -0700

    am 806d0adf: am 32557a13: am d3da696f: Bump version

    * commit '806d0adfb1f17a0649e43fdf7ef088025b94133b':
      Bump version

commit 6f3b48e4e4d15fc248296d95120dd1b6d16e592d
Merge: 1d17a72 b9ad471
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 12 07:41:25 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I7dd3477f044e2caddd8aabcb2f79773ea259ae8f

commit 3bd1b43bcec4f9bc886c76821c0f1ffc1c1bcf0e
Merge: 88929cf e8e7b38
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 11 13:52:15 2012 -0700

    am e8e7b38a: am 4feac159: Oops

    * commit 'e8e7b38a482b713d57063eea21d5703ec2043374':
      Oops

commit 1d17a724c7dab0e9247692971e4b7901cf11fc31
Merge: add6164 e8e7b38
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 11 13:52:02 2012 -0700

    am e8e7b38a: am 4feac159: Oops

    * commit 'e8e7b38a482b713d57063eea21d5703ec2043374':
      Oops

commit 88929cfc780bd19b93e09d427abee0647180fd09
Merge: f01683d 45f742e
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 11 13:40:56 2012 -0700

    am 45f742ec: am acf857c8: Merge "Initialize EmailContent in onCreate()" into jb-ub-mail

    * commit '45f742ec212770892fc0cfa23e96bbc51c263a48':
      Initialize EmailContent in onCreate()

commit add61642d77354455b882ad568343cd5f366eab9
Merge: c790df1 45f742e
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 11 13:40:51 2012 -0700

    am 45f742ec: am acf857c8: Merge "Initialize EmailContent in onCreate()" into jb-ub-mail

    * commit '45f742ec212770892fc0cfa23e96bbc51c263a48':
      Initialize EmailContent in onCreate()

commit f01683d3c2352ed0d5c584afce943eba5c41677b
Merge: bbc1a9d 234fff5
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 11 12:14:44 2012 -0700

    am 234fff58: am 57f30d49: Sigh; new events aren\'t modifiable on the server

    * commit '234fff58d7ca6d313da346698e7da6a6e36a6eb8':
      Sigh; new events aren't modifiable on the server

commit c790df1a342399241099dcda4cc36a631868b92e
Merge: 806d0ad 234fff5
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 11 12:14:25 2012 -0700

    am 234fff58: am 57f30d49: Sigh; new events aren\'t modifiable on the server

    * commit '234fff58d7ca6d313da346698e7da6a6e36a6eb8':
      Sigh; new events aren't modifiable on the server

commit bbc1a9d8e57c1a32d8bcf256ad2a1b93689d33c9
Merge: 6aab14c 32557a1
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 11 10:20:40 2012 -0700

    am 32557a13: am d3da696f: Bump version

    * commit '32557a130548343b00870ae088b31da8ce7f3495':
      Bump version

commit 806d0adfb1f17a0649e43fdf7ef088025b94133b
Merge: 47156d6 32557a1
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 11 10:20:34 2012 -0700

    am 32557a13: am d3da696f: Bump version

    * commit '32557a130548343b00870ae088b31da8ce7f3495':
      Bump version

commit 1a2fb1b5d8408646ee8e382b2fd0aa841ae0b15b
Merge: 3985c18 47156d6
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 17:15:46 2012 -0700

    am 47156d68: am 51d3ccbe: am c8d2b1e2: Bump version; make same as Email

    * commit '47156d684d394d05aa45a9a6e2de8e96d048bcae':
      Bump version; make same as Email

commit 3985c185cdf850ee50805a0ec05400821704025d
Merge: 63d781f 55a35c9
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 17:14:47 2012 -0700

    am 55a35c98: am 7bd852fc: am ec1c0f53: Merge "Fix adapters; sigh." into jb-ub-mail

    * commit '55a35c9872d7ca0842386cf0c5aaeaa033c6202c':
      Fix adapters; sigh.

commit 63d781fc30eebee852501bc31f16f11194b9d500
Merge: 0a7fa54 29e8161
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 10 17:14:07 2012 -0700

    am 29e81615: (-s ours) am 8a0d1726: am 4036e054: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '29e81615090ce2898f4dfaef9d8fcac9bd119228':
      Import translations. DO NOT MERGE

commit 0a7fa54e003efe0453b85210391893659ccb349f
Merge: c1eaf1b 87fba8d
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 10 17:14:05 2012 -0700

    am 87fba8da: (-s ours) am 9199a501: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

    * commit '87fba8da1e4ca1e2461618cf1e1d8023720d0514':
      Import translations. DO NOT MERGE

commit c1eaf1b4b447094d5b5c853ce531699d16435319
Merge: 41ea788 1b0ab55
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 17:13:59 2012 -0700

    am 1b0ab552: am bb7fde5f: am bbafcf7d: Make sure EmailContent.init() is called on startup

    * commit '1b0ab552367974e5dbf1a3c14564366364e05e15':
      Make sure EmailContent.init() is called on startup

commit 41ea78829f31f36c72970f1840115df93d4b770d
Merge: adbf7eb 7dff8e9
Author: Paul Westbrook <pwestbro@google.com>
Date:   Mon Sep 10 17:12:51 2012 -0700

    am 7dff8e98: am 32d70252: am c2dd2b18: increment versionCode

    * commit '7dff8e981373a558594d51b9c2e480daf4f6f5ac':
      increment versionCode

commit adbf7eb9336c8a9a4b9c0dbfe696f1d09ceb2653
Merge: 4febc53 d8444b4
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 17:11:12 2012 -0700

    am d8444b43: am 76657928: am dbf33a92: Update to new Attachment getContentUri method

    * commit 'd8444b4381853f5e839a9075811b295c50bc3cc3':
      Update to new Attachment getContentUri method

commit 4febc53e09b01e01e21949b483d92abd41e2fdaf
Merge: 7435c51 6330a18
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 17:06:41 2012 -0700

    am 6330a182: am f58bb036: am bcc7188e: Try to use names from time zone strings if all else fails...

    * commit '6330a182e145bcd639fdda3d32de0d22f857ed3c':
      Try to use names from time zone strings if all else fails...

commit 6aab14c5116dc6511e5e1e650d39b6cd14c0c6c5
Merge: d6f73f0 51d3ccb
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 14:07:32 2012 -0700

    am 51d3ccbe: am c8d2b1e2: Bump version; make same as Email

    * commit '51d3ccbe368312594b82fac10b1be11052ad9132':
      Bump version; make same as Email

commit 47156d684d394d05aa45a9a6e2de8e96d048bcae
Merge: 55a35c9 51d3ccb
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 14:07:23 2012 -0700

    am 51d3ccbe: am c8d2b1e2: Bump version; make same as Email

    * commit '51d3ccbe368312594b82fac10b1be11052ad9132':
      Bump version; make same as Email

commit d6f73f0d0bec41642bfa56eec685e3cad1e783c3
Merge: b050c67 7bd852f
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 11:23:21 2012 -0700

    am 7bd852fc: am ec1c0f53: Merge "Fix adapters; sigh." into jb-ub-mail

    * commit '7bd852fc669ac5c63e6c01b39cd04cbefd76f9c7':
      Fix adapters; sigh.

commit 55a35c9872d7ca0842386cf0c5aaeaa033c6202c
Merge: 29e8161 7bd852f
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 11:23:17 2012 -0700

    am 7bd852fc: am ec1c0f53: Merge "Fix adapters; sigh." into jb-ub-mail

    * commit '7bd852fc669ac5c63e6c01b39cd04cbefd76f9c7':
      Fix adapters; sigh.

commit b050c67462b871a367499637738da784c2a07445
Merge: d78413d 8a0d172
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 10 10:03:54 2012 -0700

    am 8a0d1726: (-s ours) am 4036e054: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

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

commit 29e81615090ce2898f4dfaef9d8fcac9bd119228
Merge: 87fba8d 8a0d172
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 10 10:03:47 2012 -0700

    am 8a0d1726: am 4036e054: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

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

commit d78413daae384f64bb787e6f8b38db85baf70b8e
Merge: 7b4f6a8 9199a50
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 10 10:02:21 2012 -0700

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

    * commit '9199a501f51b1535735acc823814702be80b37a4':
      Import translations. DO NOT MERGE

commit 87fba8da1e4ca1e2461618cf1e1d8023720d0514
Merge: 1b0ab55 9199a50
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 10 10:02:14 2012 -0700

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

    * commit '9199a501f51b1535735acc823814702be80b37a4':
      Import translations. DO NOT MERGE

commit 7435c51db63133f86ef7c1e3fd2e3079a442836b
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Sep 10 09:02:48 2012 -0700

    Import translations. DO NOT MERGE

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

commit 7b4f6a8497ce90fe5665b34ab3600a6a65a7f788
Merge: 3a53cec bb7fde5
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 08:53:22 2012 -0700

    am bb7fde5f: am bbafcf7d: Make sure EmailContent.init() is called on startup

    * commit 'bb7fde5fa1892ccf84b5e376c92ecbdaf170f102':
      Make sure EmailContent.init() is called on startup

commit 1b0ab552367974e5dbf1a3c14564366364e05e15
Merge: 7dff8e9 bb7fde5
Author: Marc Blank <mblank@google.com>
Date:   Mon Sep 10 08:53:15 2012 -0700

    am bb7fde5f: am bbafcf7d: Make sure EmailContent.init() is called on startup

    * commit 'bb7fde5fa1892ccf84b5e376c92ecbdaf170f102':
      Make sure EmailContent.init() is called on startup

commit 3a53cec52b750ba2580c5d77144a3c0280c1067f
Merge: 0589222 32d7025
Author: Paul Westbrook <pwestbro@google.com>
Date:   Sun Sep 9 18:46:17 2012 -0700

    am 32d70252: am c2dd2b18: increment versionCode

    * commit '32d702527b89fb12fdc03a5ccd84985122c5f7f0':
      increment versionCode

commit 7dff8e981373a558594d51b9c2e480daf4f6f5ac
Merge: d8444b4 32d7025
Author: Paul Westbrook <pwestbro@google.com>
Date:   Sun Sep 9 18:46:07 2012 -0700

    am 32d70252: am c2dd2b18: increment versionCode

    * commit '32d702527b89fb12fdc03a5ccd84985122c5f7f0':
      increment versionCode

commit 0589222e2fb794d6fbf7f5b81ff3a31d2496276e
Merge: c75e209 7665792
Author: Marc Blank <mblank@google.com>
Date:   Sun Sep 9 10:49:49 2012 -0700

    am 76657928: am dbf33a92: Update to new Attachment getContentUri method

    * commit '76657928d8592c99712766eb0c98da6b85841512':
      Update to new Attachment getContentUri method

commit d8444b4381853f5e839a9075811b295c50bc3cc3
Merge: 6330a18 7665792
Author: Marc Blank <mblank@google.com>
Date:   Sun Sep 9 10:49:44 2012 -0700

    am 76657928: am dbf33a92: Update to new Attachment getContentUri method

    * commit '76657928d8592c99712766eb0c98da6b85841512':
      Update to new Attachment getContentUri method

commit c75e209d832ae33e72ffe6d2efc9f8674823ba97
Merge: 45a00b0 f58bb03
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 7 16:42:54 2012 -0700

    am f58bb036: am bcc7188e: Try to use names from time zone strings if all else fails...

    * commit 'f58bb036b2e1e21272c8cbe0ca86e71a5f2ac9ab':
      Try to use names from time zone strings if all else fails...

commit 6330a182e145bcd639fdda3d32de0d22f857ed3c
Merge: 80ecf80 f58bb03
Author: Marc Blank <mblank@google.com>
Date:   Fri Sep 7 14:25:25 2012 -0700

    am f58bb036: am bcc7188e: Try to use names from time zone strings if all else fails...

    * commit 'f58bb036b2e1e21272c8cbe0ca86e71a5f2ac9ab':
      Try to use names from time zone strings if all else fails...

commit 45a00b03f30c0c2c7838405d1ee2766ff00b1c4a
Merge: 8f333f4 0bf0a17
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Sep 7 13:42:41 2012 -0700

    am 0bf0a177: (-s ours) am 0ba3de25: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

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

commit d3fe3d8f407f4cb70f5c9d2981ba59aeb742ee22
Merge: 0b1808e 80ecf80
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 6 12:15:33 2012 -0700

    am 80ecf803: (-s ours) am 0bf0a177: am 0ba3de25: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

    * commit '80ecf8030f6706b7b6c8043dc5c3c1baf2f77d00':
      Import translations. DO NOT MERGE

commit 80ecf8030f6706b7b6c8043dc5c3c1baf2f77d00
Merge: 1a709b0 0bf0a17
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Sep 6 12:14:17 2012 -0700

    am 0bf0a177: am 0ba3de25: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail

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

commit 0b1808e309dc48b46303e163a01c7bff03f2be05
Merge: 7d25a5b 1a709b0
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 6 10:20:06 2012 -0700

    am 1a709b0d: am 8f333f4d: am fd7aac1f: Fix potential looping issue

    * commit '1a709b0d5c811c019a9165c49cbdfaad4336a7f0':
      Fix potential looping issue

commit 1a709b0d5c811c019a9165c49cbdfaad4336a7f0
Merge: e60c163 8f333f4
Author: Marc Blank <mblank@google.com>
Date:   Thu Sep 6 10:18:09 2012 -0700

    am 8f333f4d: am fd7aac1f: Fix potential looping issue

    * commit '8f333f4dd3b9e38cf33077bae3d1f68fce1d9c56':
      Fix potential looping issue

commit 7d25a5b03a222d071c91b4eb9316e5686c29fc4c
Merge: 730cbca e60c163
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 6 09:12:38 2012 -0700

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

    * commit 'e60c163850cd31c78a8736e809bbd058f872166b':
      Fix problem w/ all-day event in invitation

commit e60c163850cd31c78a8736e809bbd058f872166b
Merge: ca385e1 254c27b
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 6 07:54:31 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I75c9eb27b71b2fe90f5ba76b7000625e094d0f4e

commit 730cbcadf3ab4e86511eec44031a47c6009dd8a1
Merge: 2778b2a ca385e1
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 4 16:12:59 2012 -0700

    am ca385e14: am a4aa555e: Merge "Revert "Revert "Fix build""" into jb-ub-mail

    * commit 'ca385e146f236883da3ffeaa9eeae2e8f1513334':
      Revert "Revert "Fix build""

commit 2778b2ac363cf0d57dfee98356f4103c500a4960
Merge: 38ef559 8336b2f
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 4 16:09:28 2012 -0700

    am 8336b2fe: am 8f8c4432: Merge "Revert "Fix build"" into jb-ub-mail

    * commit '8336b2fec858a7fa308057b403da7c3a5da5f298':
      Revert "Fix build"

commit 38ef5593ca733ef6c2a9b5f35435c59f836b5c72
Merge: a183b8b 4d9814e
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 4 16:01:40 2012 -0700

    am 4d9814e0: am 90da1699: Merge "Fix build" into jb-ub-mail

    * commit '4d9814e014ebc063ae42f00ed6e53835750b31cb':
      Fix build

commit a183b8be96b1486b795579d9c404590acfb2a2d1
Merge: 6524198 03ad44e
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 4 15:45:25 2012 -0700

    am 03ad44e5: am a3602760: Bump version code

    * commit '03ad44e5ba843721df6ddec5ed3976de1f404917':
      Bump version code

commit 6524198393b61637e1a98fa95f0223802935bbc2
Merge: 8251084 a765747
Author: Marc Blank <mblank@google.com>
Date:   Tue Sep 4 15:35:46 2012 -0700

    am a765747a: am 14a69ae1: Move product strings to build/res

    * commit 'a765747a0b8a264882619fb857cdb741993614ae':
      Move product strings to build/res

commit 82510845d90cd5a1989520e1025e5b85f4b9c33e
Merge: 0229030 bf446dc
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 1 20:08:18 2012 -0700

    am bf446dc8: am 527b5952: Fix longstanding EAS battery burner

    * commit 'bf446dc824e560c6b1422540d317f8bd5315b852':
      Fix longstanding EAS battery burner

commit 0229030543a6a68c8bd74200f351d54623341f6a
Merge: a08df37 87b1e77
Author: Marc Blank <mblank@google.com>
Date:   Sat Sep 1 16:39:05 2012 -0700

    am 87b1e777: resolved conflicts for merge of 2bf91acb to jb-mr1-dev

    * commit '87b1e777ae4e8f482a80af537dd12fe0b547a411':
      Convert authorities, intents, and account manager types

commit a08df370b2ec4c3c3927e1acd83f4ea978a79517
Merge: a606ae8 005bf7f
Author: Marc Blank <mblank@google.com>
Date:   Wed Aug 29 14:19:30 2012 -0700

    am 005bf7f9: am 92f04b67: Fix problem w/ all-day event in invitation

    * commit '005bf7f930fda2d364588bb7b1af9020af2ed7c8':
      Fix problem w/ all-day event in invitation

commit a606ae89c889cfd241d46108bf51ec12357a9f06
Merge: ee902e5 97645e9
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Aug 27 15:23:00 2012 -0700

    am 97645e98: (-s ours) am 049cbd58: (-s ours) Reconcile with jb-mr0-release - do not merge

    * commit '97645e9854c292cc1f7e394ab890fc9a0fae82c1':

commit ee902e52e897a9b109e9a433d7816e5400ac99ec
Merge: 83fa8a9 e837ee6
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Aug 23 16:06:00 2012 -0700

    am e837ee62: am 8033cb55: increment versionCode

    * commit 'e837ee62b7971ab941b597f0a653d8b6442bb3ae':
      increment versionCode

commit 83fa8a917412171f808abbe1be61f1f6e56f1945
Merge: e3d0e7b 83e1864
Author: Marc Blank <mblank@google.com>
Date:   Thu Aug 23 12:42:16 2012 -0700

    am 83e1864e: (-s ours) am a870c6a5: (-s ours) am f9ee00fb: DO NOT MERGE Fix calendar availability

    * commit '83e1864e6fec0eca8a9e141ed9a961c469762874':
      DO NOT MERGE Fix calendar availability

commit e3d0e7b12fbea460531adba16f5a19b1f447ed99
Merge: 720e5e2 efcc1ca
Author: Marc Blank <mblank@google.com>
Date:   Wed Aug 22 13:46:08 2012 -0700

    am efcc1ca1: am 05f90344: Implement change related to emailsync

    * commit 'efcc1ca100e86a2f8072665e979c8d52f3295576':
      Implement change related to emailsync

commit 720e5e2b737fdd4288b3520d08d5a464431ce0d0
Merge: 608dc7b c04adfe
Author: Marc Blank <mblank@google.com>
Date:   Mon Aug 20 15:43:55 2012 -0700

    am c04adfe0: am 3d96b3dd: When using smartSend, pass in list of attachments to send

    * commit 'c04adfe06a729309589829d0d4ab10e95bc1bbbf':
      When using smartSend, pass in list of attachments to send

commit 608dc7b933b75725ef6196b2b2006957c1ec446e
Merge: d66e1cf 395155b
Author: Marc Blank <mblank@google.com>
Date:   Sun Aug 19 12:33:16 2012 -0700

    am 395155b3: am d89ba46a: Merge "Handle onStartService to terminate ping when required" into jb-ub-mail

    * commit '395155b3067be1e6aad225bc4f944cda248094d3':
      Handle onStartService to terminate ping when required

commit d66e1cfd0a5902d88588e6140bdf851dd81b128a
Merge: 1cf7742 e3f7408
Author: Paul Westbrook <pwestbro@google.com>
Date:   Sun Aug 19 11:57:09 2012 -0700

    am e3f74084: am 8e7ce01d: increment versionCode

    * commit 'e3f740844e8a0337f35f6e25d3788b0ebeba3a19':
      increment versionCode

commit 1cf774231f8efb2d0ae8fe3d9d54b2ece3a432d5
Merge: abe58b1 135fdc6
Author: Marc Blank <mblank@google.com>
Date:   Fri Aug 17 11:34:32 2012 -0700

    am 135fdc6f: am 600b8a34: Set account hold if can\'t sync due to policy failure

    * commit '135fdc6fdcb6824ee050d0d1c41245ab1d59e572':
      Set account hold if can't sync due to policy failure

commit abe58b1b1188aee9ddff02a1d7a51534ab9e90ed
Merge: b3dbee4 6030678
Author: Michael Chan <mchan@android.com>
Date:   Wed Aug 15 15:59:34 2012 -0700

    am 60306788: Renamed calendarcommon to calendarcommon2 to avoid naming conflict with OEM devices

    * commit '60306788d571f234883d9833a97216c40289d0cf':
      Renamed calendarcommon to calendarcommon2 to avoid naming conflict with OEM devices

commit b3dbee49622fb47bfa00dfb08ca71330ab36d29d
Merge: e94abe5 71d2e3b
Author: Marc Blank <mblank@google.com>
Date:   Wed Aug 8 00:04:21 2012 -0700

    am 71d2e3bc: am e3668322: Fix calendar availability

    * commit '71d2e3bc11937878caad849781e6124290adac9f':
      Fix calendar availability

commit e94abe5834c967e9cd598519ca1751be88f0fcf5
Merge: b485028 38f11f2
Author: Marc Blank <mblank@google.com>
Date:   Wed Aug 1 14:55:27 2012 -0700

    am 38f11f2f: am fd64bd37: Fix autodiscover to work w/ new connection manager code

    * commit '38f11f2f474020c81f267ce3575ad42d2ab3de7a':
      Fix autodiscover to work w/ new connection manager code

commit b485028396be238fec58a70b6ec357f6a71a5efc
Merge: 6c81952 924059a
Author: Marc Blank <mblank@google.com>
Date:   Wed Aug 1 09:40:50 2012 -0700

    am 924059a6: am 3fedf8da: Use updated EmailClientConnectionManager API

    * commit '924059a6d3f7e7655decd242a647235497307af6':
      Use updated EmailClientConnectionManager API

commit 6c819529e47193da61a3751471a72a213df7c29f
Merge: 3980b2c 3d20a5c
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Jul 27 16:24:15 2012 -0700

    am 3d20a5c2: am 484eb1e5: Reconcile with jb-mr0-release

    * commit '3d20a5c26f6d0c88e33358fd831c7bb2742b935e':

commit 3980b2c3ad3a1d8a0b7ddd8652d5a1d8b79ffea2
Merge: ff18ecb c04ed8d
Author: Paul Westbrook <pwestbro@google.com>
Date:   Thu Jul 26 13:28:59 2012 -0700

    am c04ed8d8: (-s ours) am e6296689: (-s ours) am 09dff536: DO NOT MERGE Fix EAS backoff behavior

    * commit 'c04ed8d8b0c4bf8eccca11effc83fd467059549d':
      DO NOT MERGE Fix EAS backoff behavior

Change-Id: Ica30144d7868ff6872298211a3b13fd0738b5ef1