am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread

* commit 'edbd6139b9d699879db2f14fb03b7b6a38bab9ea':
  Merge 1911a6f7 into gingerbread. do not merge.
This commit is contained in:
Xavier Ducrohet 2011-02-28 12:29:08 -08:00 committed by Android Git Automerger
commit c6a02ff532

Diff Content Not Available