OSDN Git Service

Merge changes I7df1ff78,Ibc2e8adf into honeycomb
authorMike Lockwood <lockwood@android.com>
Wed, 19 Jan 2011 04:30:13 +0000 (20:30 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 19 Jan 2011 04:30:13 +0000 (20:30 -0800)
* changes:
  MediaScanner: Make sure name field is set for file based playlists
  MTP: Fix problem with MTP starting up on the first try.


Trivial merge