tree 527629c81c3d933cc938534aef9383a8c36142fc
parent 165c77b9e4b0e3e204cf529b1fcbfbbe25f0d9b1
parent bd3d019cc66237c23ab0658ff80aa7923e84b239
author Mike Lockwood <lockwood@android.com> 1299557338 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299557338 -0800

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

* commit 'bd3d019cc66237c23ab0658ff80aa7923e84b239':
  MTP: Use SharedPreferences for MTP device properties rather than sqlite3