Merge "Renaming MessageListAdapter to MessagesAdapter"
Merge "Work around problem w/ large CalendarProvider2 transactions"
am a3962dc7: am 572c06f9: (-s ours) DO NOT MERGE - Revert workaround for KeyguardLock problem

Merge commit 'a3962dc7cf7df3ed7f135bdd4f6b934f75b51ee4' into gingerbread-plus-aosp

* commit 'a3962dc7cf7df3ed7f135bdd4f6b934f75b51ee4':
  DO NOT MERGE - Revert workaround for KeyguardLock problem
am a3b18142: (-s ours) am a3962dc7: am 572c06f9: (-s ours) DO NOT MERGE - Revert workaround for KeyguardLock problem

Merge commit 'a3b1814284a059f7728410eddb84986022d34685'

* commit 'a3b1814284a059f7728410eddb84986022d34685':
  DO NOT MERGE - Revert workaround for KeyguardLock problem
am b2422f28: am 7a358316: Merge "Work around problem w/ large CalendarProvider2 transactions" into froyo

Merge commit 'b2422f28d0897f9795e698c2aaba68156e794cbd' into gingerbread-plus-aosp

* commit 'b2422f28d0897f9795e698c2aaba68156e794cbd':
  Work around problem w/ large CalendarProvider2 transactions
am 1e7009c8: am b2422f28: am 7a358316: Merge "Work around problem w/ large CalendarProvider2 transactions" into froyo

Merge commit '1e7009c89e7e9aa7b2434ea4dac9a998c03ac373'

* commit '1e7009c89e7e9aa7b2434ea4dac9a998c03ac373':
  Work around problem w/ large CalendarProvider2 transactions
Extract MockVendorPolicy, add standard mechanism to inject it.

One thing that bothers me regarding the new ImapStore is that there is no
tests to verify if the way how getImapId() uses a vendor policy hasn't changed.
This part is hard to test with a real vendor policy, and it can easily be
overlooked even if it's broken.

This CL offers ImapStoreUnitTests a way to test the interaction between
getImapId() and a vendor policy.

Also fixed a bug in VendorPolicyLoaderTest where it assumed the test apk
package name is "com.android.email.tests", but it may actually be
"com.google.android.email.tests" now.  (Broken since the test makefile
used inherit-package.)

Change-Id: I8feb616ea28cb5cae5b4fba57e363771014ac599
Merge "Extract MockVendorPolicy, add standard mechanism to inject it."
Fix NPE in Controller and MessagingController.

Bug 2553401
Bug 2186777
Bug 2721133
Bug 2684365
Bug 2530534

Change-Id: I5185d9196deab5ba3a9866e2de2a9be04a04ca03
Add tests for CalendarSyncAdapter

* Test for creation of a typical event
* Test for creation of an event with redacted attendees
* More to come

Change-Id: Ica117cd20a9e270ffe49efed75607e92b4d8ac90
Merge "Fix NPE in Controller and MessagingController."
Update to match new fragment context menu API.

Change-Id: I18950e55abd1e72d97f7a62393abe422001ee2f5
Merge (-sours) commit '36d3dfaeac1a80561ef41a78ecc9bf3583d0ca7b' into oxygen_1006

* commit '36d3dfaeac1a80561ef41a78ecc9bf3583d0ca7b':
  Extract MockVendorPolicy, add standard mechanism to inject it.
Merge commit '7e1de3c484ad0faa5f2d789649c1b4979e071044' into oxygen_1006

* commit '7e1de3c484ad0faa5f2d789649c1b4979e071044':
  Fix NPE in Controller and MessagingController.
Merge commit '1a3b2f7de2c73750870871b6f288474476d7e04e' into oxygen_1006

* commit '1a3b2f7de2c73750870871b6f288474476d7e04e':
  Add tests for CalendarSyncAdapter
Merge commit '75939a7dc8aabfb13bc376a6c9ae7ad4adc24881' into oxygen_1006

* commit '75939a7dc8aabfb13bc376a6c9ae7ad4adc24881':
  Update to match new fragment context menu API.