am 724ec1b7: (-s ours) Merge change 21469 into eclair

Merge commit '724ec1b7da16cfb384e55daa0ad5b6cae8289314'

* commit '724ec1b7da16cfb384e55daa0ad5b6cae8289314':
  do not merge: Merged CL 21093 from goog/master to goog/eclair
This commit is contained in:
satok 2009-08-16 23:14:18 -07:00 committed by Android Git Automerger
commit 1e9fffc5f2

Diff Content Not Available