Rename USER_QUERY to LIVE_QUERY

Bug: 7202801 "No connection." error

Change-Id: I4d34e75988f3d4fc2819531b1db0a3bf1fab5499
increment versionCode

Change-Id: I91aa4fbabc699ce0f55a03a7b8bb69bb6353fe8a
Fix cannot create EAS account when using a APN with proxy

The platform supports APN with proxy by default. But it's just for
the scheme type is "http" and "https". For "httpts", it does not work.

Change-Id: I8be38a01c8125e4a04cad965bf5412fd9549b186
increment versionCode

Change-Id: Id974f2a53f8953b687c423e044c1c44013ed0bcd
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

This is a cherry-pick of:
https://googleplex-android-review.googlesource.com/#/c/254063/

Change-Id: Ibaf009855c174a2377b0dbde4b5c7bfadb3db4cf
don't set versionName

This is now set as part of the build process

Change-Id: Ia1d00c994d39d5b537d58a61d1fcbdf424b4b254
Fix calendar all-day exception event delete problem.

When computing original instance time for all-day exception event
in setTimeRelatedValues(), transfer local timezone time to
UTC timezone time correctly.

Change-Id: I8f431ea360b92ec3e84c93be773f7fcb8a0c4af1
Avoid searching non-existent dir

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

Change-Id: Id5d8b8ec4e0349c86edfbe1d0f58d50d9146cf43
Increment version for Exchange.

Change-Id: I58b52fe2f8c7ef8d7f6a225122d7595a7ae8aae4
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

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>
am dc952b9a: (-s ours) am d61fe17f: am e0faab0f: am 14367f5b: am 438fa99e: (-s ours) am 68a406b3: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'dc952b9a042a4b18049de8c7ae13516820b565f2':
Increment Exchange version number.

Change-Id: I9b8571f3a7c23bc04a767f988b6db3855fc88f72
Increment Exchange version.

Change-Id: I8141aad828b88b214254e918ff2cd92cb6d2424b
Move system folder string resources to emailcommon.

Also rename emailcommon2 to emailcommon.

This is a multi-project submit with
I6c6eec4f1bcf2abd54c1ed05da1add8d894ee403 and
I5746c0353783f9b29d52d6540472588c6542a6a2

Change-Id: I4a071a07c3e33aaa4ea404eb66a8db1eabc9ef0e
Prevent NPE when setting up a bad account.

Bug: 8349343
Change-Id: I07ce28e5d84b9c60f09fefc3e8f5dcf1b5224b95
Increment version number.

Change-Id: I876a2d7a62230ce3c565d2806a8f21bdf61b4d41
increment versionCode

Change-Id: Ib5c1c8a40b02ae8145d1dc94862c605f9e17f5ea
Increment version number.

Change-Id: Id0abbcd180e283a4017d993a4b9acc8c2c880bd3
Prevent NPEs

ContentResolver#query() can return null.  Log if this happens, and don't
crash

Bug: 7225209
Change-Id: Iea8f8ce3da81856562cbc9db793106fa5b118f14
Merge "Avoid searching non-existent dir"