Merge "ActionBar for AccountFolderList"
Fix problem with unencoded data in URI sent to EAS

* We need to encode the itemId and collectionId for SmartForward and
  SmartReply
* Add unit test for the fix
* Small change + test to EasSyncService usage of URI encoding to use
  a non-deprecated method

Bug: 2787725
Change-Id: I428b308b56cc359b8cdd9e42bc3f42c65b6797dc
Merge "Fix problem with unencoded data in URI sent to EAS"
Always use the mime-type "message/rfc822" for eml files.

Bug 2795919

Change-Id: Ie20fccdad34d7d17d7444af25d3e57033a45de5a
Preliminary GAL/Contacts integration for EAS

Change-Id: I9997ac96f83f427c71caf12d591ba6069bedf935
Merge "Always use the mime-type "message/rfc822" for eml files."
Fix reference to Exchange directory provider class

Bug: 2807264
Change-Id: I916dff07e3159b1537619cb7d6f8a082b5094444
Merge commit '270b0c1f83381d524eb521f95926708448bf4898' into oxygen_1006

* commit '270b0c1f83381d524eb521f95926708448bf4898':
  Fix reference to Exchange directory provider class
  Preliminary GAL/Contacts integration for EAS
  Always use the mime-type "message/rfc822" for eml files.
  Fix problem with unencoded data in URI sent to EAS

Conflicts:
	tests/src/com/android/exchange/EasSyncServiceTests.java