tree 8009c8e46351dafac6774d3b9ce0483550333f92
parent 8288f66f0af45c82ffa2394a419e1f7c9393c048
parent 8155b783faf75a4e5e3f107d19f7984659f93104
author Marco Nelissen <marcone@google.com> 1271787850 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1271787850 -0700

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: I56761240d6f6e699514169d80a445317ba0de9e2" into froyo