tree d24677ac4cc5c387d4c40eb2561401c816f1fba2
parent 1514f9a69dcfa65fd14ca8fff95db7b1172b78b0
parent 136f37b88f0faaebb401d251c18a4f727c5ba8e4
author Jerry Zhang <zhangjerry@google.com> 1490046868 +0000
committer android-build-merger <android-build-merger@google.com> 1490046868 +0000

Merge "Add support for MTP perceived device type property." am: b6ed343e85 am: 7644b885c7
am: 136f37b88f

Change-Id: I446cd52e5fd8cda48e9af46ee3faee5578cae286