tree 070d966b5d9d70b483c99ea344deafb9c47c76b5
parent 0b41add7585ab54bbb58f7380384da628023ddf6
parent dc7ceaf5bd309f9942aaa7c391d31d3bd0a76288
author Android (Google) Code Review <android-gerrit@google.com> 1246903760 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1246903760 -0700

Merge change 6231 into donut

* changes:
  Don't trim() in the mediascanner, as that would remove the special "sort first" character.