tree 9682b6710c606c258bc3a42f489d1b63592e2fb1
parent 124198d8ad599b955d298cffe0370df4f036b678
parent b239b683765f63d79e74b8ba2a8cc2855f236536
author Mike Lockwood <lockwood@android.com> 1302035809 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1302035809 -0700

Merge "MTP and media provider support for multiple storage devices:"