tree 1e6a02f65a251529a645a87dfdc5b3a66e11f599
parent d2a787e686816898c9f637167d497a99b7d244e8
parent 2a8220ac659f9a642255cc4f07dab67c523cd322
author Jerry Zhang <zhangjerry@google.com> 1529229217 -0700
committer android-build-merger <android-build-merger@google.com> 1529229217 -0700

Merge "Mount ptp separately from mtp" into pi-dev am: ff400ec976 am: 6a5b21be3a am: 87ac96899a
am: 2a8220ac65

Change-Id: I37df8b69caa8db76c4568e762c49482602f38648