merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I95ca40513c2acdba4378d776a7158a65ee724adf
Only clear sync error map on success

We don't want to clear the error map unless there was a successful
sync.  Otherwise, the device will attempt a sync evert 15 seconds

This is the first part of the fix for bug 7567773

Change-Id: Icd0e70d87a7f588e242f0f100ee0b36b3aa85d89
Exchange: calendar sync window linked to email sync window

Email sync <= 2 weeks, Calendar sync = 2 weeks
Email sync = 1 month, Calendar sync = 1 month
Email sync all, Calendar sync all

Ported from: http://review.cyanogenmod.org/#/c/10836/

Change-Id: Ie68528218d993f9c550fe4f6ab44a75c7e9857f8
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Exchange into 1.1

Android 4.2.2 release 1
Correct a German translation error in Exchange app

Corrects a German translation error in the Exchange app thus fixing bug 43079 https://code.google.com/p/android/issues/detail?id=43079

Rebase Mon 11th March 2013

AOSP Change-Id: Ie0d8cecbf8602ad0494ff5ca2c7f9db56184cd53
Fixes: bug Issue 43079 https://code.google.com/p/android/issues/detail?id=43079
Signed-off-by: Emma Sajic <esajic@effectivelateralsolutions.co.uk>

Change-Id: I16fea97904032c20b4147c6a770c0a66a0f95650
Avoid searching non-existent dir

Don't call all-java-files-under src since there is no src directory

Change-Id: Id5d8b8ec4e0349c86edfbe1d0f58d50d9146cf43
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1