OSDN Git Service

am 9f3f3c2f: (-s ours) am 1a3ece9f: Merge "MTP: Add support for restricting PTP to...
authorMike Lockwood <lockwood@google.com>
Sat, 3 Dec 2011 01:57:19 +0000 (17:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 3 Dec 2011 01:57:19 +0000 (17:57 -0800)
commit0cb4b9a6aa1f1f28b7b5d3e02b1d7fac70817b0a
tree27c6aed77ee974054e91426386a8daa23ca4bab6
parent326805adc3be4936a26c60be107c205f492a82e1
parentfa845c6d4637fee51b34d9c1cf06db42b97ac0f4
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