am 35a4deb6: (-s ours) am 8c02a817: Merge "DO NOT MERGE: Add TODOs to ImapStore." into gingerbread

Merge commit '35a4deb6a0534b6cf88a455211b2056311782281'

* commit '35a4deb6a0534b6cf88a455211b2056311782281':
  DO NOT MERGE: Add TODOs to ImapStore.
This commit is contained in:
Makoto Onuki 2010-09-21 10:45:21 -07:00 committed by Android Git Automerger
commit d0cf98b231

Diff Content Not Available