am 39166ef9: (-s ours) am b1487a20: DO NOT MERGE: Back-port 2249953 fix (for email unbundling).

Merge commit '39166ef9cee9cb395d818305506ca6956f8fc750'

* commit '39166ef9cee9cb395d818305506ca6956f8fc750':
  DO NOT MERGE: Back-port 2249953 fix (for email unbundling).
This commit is contained in:
Elliott Hughes 2009-11-16 14:49:47 -08:00 committed by Android Git Automerger
commit 5d987f98f6

Diff Content Not Available