tree af58bbe421c44aff57a72a7f1588eb662077f45a
parent 5fc179b22d59a035ff6c15bf07463f767bc6f008
parent 7644b885c7cce095a18f3deb6d46a56e40755153
author Jerry Zhang <zhangjerry@google.com> 1490046361 +0000
committer android-build-merger <android-build-merger@google.com> 1490046361 +0000

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

Change-Id: If09ce7609ff999c7dc32d7cc5db4917eae50748c