tree a745c2c96dea1012883a0e6fcd5ef7434ccead62
parent 30be970a8ecd984ace75354e00a8d969577d18e9
parent f26af124e3552f18f127eabf88ebcb9e13a80855
author Daichi Hirono <hirono@google.com> 1448955732 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1448955732 +0000

Merge "Handle Android M as a MTP device in MtpManagerTest."