am 823f5bf3: Merge "MTP: Use SharedPreferences for MTP device properties...
am 823f5bf3: Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1
* commit '823f5bf3':
MTP: Use SharedPreferences for MTP device properties rather than sqlite3