| commit | 0cb4b9a6aa1f1f28b7b5d3e02b1d7fac70817b0a | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@google.com> | Fri Dec 02 17:57:19 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 02 17:57:19 2011 -0800 |
| tree | 27c6aed77ee974054e91426386a8daa23ca4bab6 | |
| parent | 326805adc3be4936a26c60be107c205f492a82e1 [diff] | |
| parent | fa845c6d4637fee51b34d9c1cf06db42b97ac0f4 [diff] |
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