am 26c1ab2e: Merge "MTP: Strip ".pla" file extension from name field for WMP playlists" into honeycomb

* commit '26c1ab2e58f47ac94e638f69b9b626cc6b1925b6':
  MTP: Strip ".pla" file extension from name field for WMP playlists

media/java/android/mtp/MtpDatabase.java

@@ -196,6 +196,10 @@ public class MtpDatabase {
                 if (lastSlash >= 0) {
                     name = name.substring(lastSlash + 1);
                 }
+                // strip trailing ".pla" from the name
+                if (name.endsWith(".pla")) {
+                    name = name.substring(0, name.length() - 4);
+                }
 
                 ContentValues values = new ContentValues(1);
                 values.put(Audio.Playlists.DATA, path);