tree f0d358b81b0f6dbfb6f442958d664bd731bd76ec
parent eef3b1c23e7753bd843fcb79d9f02010ca51d4f8
parent e7e9fabc7cb4d4dd1046e406ad03ec4a3bf50575
author Jerry Zhang <zhangjerry@google.com> 1481589435 +0000
committer android-build-merger <android-build-merger@google.com> 1481589435 +0000

Merge "Run the configure method when mtp or ptp is enabled." am: 7477c6a13a
am: e7e9fabc7c

Change-Id: I6edeb9069e0d806b186ce7520e5869c1965cbd89