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
am 3d20a5c2: am 484eb1e5: Reconcile with jb-mr0-release

* commit '3d20a5c26f6d0c88e33358fd831c7bb2742b935e':
am 924059a6: am 3fedf8da: Use updated EmailClientConnectionManager API

* commit '924059a6d3f7e7655decd242a647235497307af6':
  Use updated EmailClientConnectionManager API
am 38f11f2f: am fd64bd37: Fix autodiscover to work w/ new connection manager code

* commit '38f11f2f474020c81f267ce3575ad42d2ab3de7a':
  Fix autodiscover to work w/ new connection manager code
am 71d2e3bc: am e3668322: Fix calendar availability

* commit '71d2e3bc11937878caad849781e6124290adac9f':
  Fix calendar availability
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
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
am e3f74084: am 8e7ce01d: increment versionCode

* commit 'e3f740844e8a0337f35f6e25d3788b0ebeba3a19':
  increment versionCode
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
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
am efcc1ca1: am 05f90344: Implement change related to emailsync

* commit 'efcc1ca100e86a2f8072665e979c8d52f3295576':
  Implement change related to emailsync
am 83e1864e: (-s ours) am a870c6a5: (-s ours) am f9ee00fb: DO NOT MERGE Fix calendar availability

* commit '83e1864e6fec0eca8a9e141ed9a961c469762874':
  DO NOT MERGE Fix calendar availability
am e837ee62: am 8033cb55: increment versionCode

* commit 'e837ee62b7971ab941b597f0a653d8b6442bb3ae':
  increment versionCode
am 97645e98: (-s ours) am 049cbd58: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '97645e9854c292cc1f7e394ab890fc9a0fae82c1':
am 005bf7f9: am 92f04b67: Fix problem w/ all-day event in invitation

* commit '005bf7f930fda2d364588bb7b1af9020af2ed7c8':
  Fix problem w/ all-day event in invitation
am 87b1e777: resolved conflicts for merge of 2bf91acb to jb-mr1-dev

* commit '87b1e777ae4e8f482a80af537dd12fe0b547a411':
  Convert authorities, intents, and account manager types
am bf446dc8: am 527b5952: Fix longstanding EAS battery burner

* commit 'bf446dc824e560c6b1422540d317f8bd5315b852':
  Fix longstanding EAS battery burner
am a765747a: am 14a69ae1: Move product strings to build/res

* commit 'a765747a0b8a264882619fb857cdb741993614ae':
  Move product strings to build/res
am 03ad44e5: am a3602760: Bump version code

* commit '03ad44e5ba843721df6ddec5ed3976de1f404917':
  Bump version code
am 4d9814e0: am 90da1699: Merge "Fix build" into jb-ub-mail

* commit '4d9814e014ebc063ae42f00ed6e53835750b31cb':
  Fix build