am 36d8b3ea: Merge "Set the file timestamp using the device info."

* commit '36d8b3eafd8b315e79e84d4e7f8cfc40afc3a255':
diff --git a/src/music-players.h b/src/music-players.h
index 4e1caab..6867887 100644
--- a/src/music-players.h
+++ b/src/music-players.h
@@ -45,6 +45,8 @@
    * some of the folders will start to disappear when getting all objects
    * and properties.
    */
+
+  { "Samsung",  0x4e8, "Galaxy S2, S3, Note", 0x6860, DEVICE_FLAG_NONE},
   { "Motorola", 0x22b8, "Xoom", 0x70a9, DEVICE_FLAG_NONE },
   { "Motorola", 0x22b8, "Xoom", 0x70a8 , DEVICE_FLAG_NONE},
   { "Creative", 0x041e, "ZEN Vision", 0x411f, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL },