am 21c0800f: (-s ours) am d3e4290c: DO NOT MERGE MTP and media provider...
am 21c0800f: (-s ours) am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage devices:
* commit '21c0800f':
DO NOT MERGE MTP and media provider support for multiple storage devices: