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 '9f3f3c2fbe23a4d9360cffc9975e5cc99f67107e':
  MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
tree: 27c6aed77ee974054e91426386a8daa23ca4bab6
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/