am 9b8b417c: Merge "When updating existing entries in the media database,...

am 9b8b417c: Merge "When updating existing entries in the media database, don\'t update the is_music, is_ringtone, etc columns. This ensures that custom ringtones will still be shown in the ringtone picker after a rescan. Bug 2594125 Change-Id: I56761240d6f6e699514169d

Merge commit '9b8b417c' into froyo-plus-aosp

* commit '9b8b417c':
  When updating existing entries in the media database, don't update