am ed86eaa7: Merge "Argh oops I didn\'t mean to delete this." into gingerbread

Merge commit 'ed86eaa7301d5509bce38dffce3f8ef11e4e4cd0' into gingerbread-plus-aosp

* commit 'ed86eaa7301d5509bce38dffce3f8ef11e4e4cd0':
  Argh oops I didn't mean to delete this.
This commit is contained in:
Dianne Hackborn 2010-07-14 17:04:58 -07:00 committed by Android Git Automerger
commit fddb4b4caa

Diff Content Not Available