am 941fa185: (-s ours) am 86fa29ad: DO NOT MERGE. Get rid of the user feedback preference from Gingerbread.

Merge commit '941fa185accfce2a03c3c0b4c6092d50f40bdbad'

* commit '941fa185accfce2a03c3c0b4c6092d50f40bdbad':
  DO NOT MERGE.  Get rid of the user feedback preference from Gingerbread.
main
Ken Wakasa 2010-09-17 02:44:07 -07:00 committed by Android Git Automerger
commit deb4267631

Diff Content Not Available