summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2011-12-02 17:57:19 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-02 17:57:19 -0800
commitcab522de8515e2a530d1c02901a9132ac336675e (patch)
tree5e7b7cc2b536b56d3ca678bece14ed5116160a70
parentec61b5cb12dabb2ce22193ce698189bebd9dc516 (diff)
parent9f3f3c2fbe23a4d9360cffc9975e5cc99f67107e (diff)
downloadframeworks_base-cab522de8515e2a530d1c02901a9132ac336675e.zip
frameworks_base-cab522de8515e2a530d1c02901a9132ac336675e.tar.gz
frameworks_base-cab522de8515e2a530d1c02901a9132ac336675e.tar.bz2
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
0 files changed, 0 insertions, 0 deletions