am 9f3f3c2f: (-s ours) am 1a3ece9f: Merge "MTP: Add support for restricting...
am 9f3f3c2f: (-s ours) am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
* commit '9f3f3c2f':
MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE