summaryrefslogtreecommitdiffstats
path: root/libs/utils/CallStack.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2010-04-20 11:33:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-20 11:33:21 -0700
commitfe13eebee964cd9e91270403e3910c08d898ad31 (patch)
treef51318cb9d23c4b193eb15f6b967f1e900f8accf /libs/utils/CallStack.cpp
parent5b550c9efc2cc10e376ae20c1947a7ce769e9660 (diff)
parent9d14e3ea22f48173070789951ee6dc64b507e13f (diff)
downloadframeworks_base-fe13eebee964cd9e91270403e3910c08d898ad31.zip
frameworks_base-fe13eebee964cd9e91270403e3910c08d898ad31.tar.gz
frameworks_base-fe13eebee964cd9e91270403e3910c08d898ad31.tar.bz2
am 9d14e3ea: 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: I56761240d
Merge commit '9d14e3ea22f48173070789951ee6dc64b507e13f' into kraken * commit '9d14e3ea22f48173070789951ee6dc64b507e13f': When updating existing entries in the media database, don't update
Diffstat (limited to 'libs/utils/CallStack.cpp')
0 files changed, 0 insertions, 0 deletions