am 7bc1cee2: (-s ours) am 75c6a611: Merge "DO NOT MERGE: Test for interaction between ImapStore and vendor policy." into gingerbread

Merge commit '7bc1cee27814021df8b22d2099fe7e953bd36fac'

* commit '7bc1cee27814021df8b22d2099fe7e953bd36fac':
  DO NOT MERGE: Test for interaction between ImapStore and vendor policy.
This commit is contained in:
Makoto Onuki 2010-09-21 10:45:44 -07:00 committed by Android Git Automerger
commit ace475175d

Diff Content Not Available