| commit | cab522de8515e2a530d1c02901a9132ac336675e | [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 | 5e7b7cc2b536b56d3ca678bece14ed5116160a70 | |
| parent | ec61b5cb12dabb2ce22193ce698189bebd9dc516 [diff] | |
| parent | 9f3f3c2fbe23a4d9360cffc9975e5cc99f67107e [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