tree 494e58c1d7f5285289d3dbe2a4b76214ef976a89
parent 7bbc3c4bbe9e542abba2ad30072efb1b25fd9ea2
parent 1a3ece9f871c94eb524543ae618a2a1c88cab2cd
author Mike Lockwood <lockwood@google.com> 1322860937 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322860937 -0800

am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1

* commit '1a3ece9f871c94eb524543ae618a2a1c88cab2cd':
  MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE