tree 48623910fe75822605f4a4c5884e8b8bcd745d86
parent 1740eee1d0235bb540f785ba01a70484fd29bc6e
parent f7f7fff40be7967376319d4f96d967f25853855b
author Mike Lockwood <lockwood@google.com> 1322860849 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1322860849 -0800

Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1