am fc023055: (-s ours) am 88316f70: am 0bf3ac2c: (-s ours) do not merge - Fix for issue 2184627 cherry picked from eclair-mr2

Merge commit 'fc023055dba94779d5ab5455c1eab071e00a786e'

* commit 'fc023055dba94779d5ab5455c1eab071e00a786e':
  do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
This commit is contained in:
Eric Laurent
2009-10-28 23:49:02 -07:00
committed by Android Git Automerger

Diff Content Not Available