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