tree 1e6a02f65a251529a645a87dfdc5b3a66e11f599
parent 2fcd35e8673a5a00a61fa3d99f66f1cece9e456e
parent 87ac96899ab1b9581ad40f2f62f175cccbe9e139
author Jerry Zhang <zhangjerry@google.com> 1529228981 -0700
committer android-build-merger <android-build-merger@google.com> 1529228981 -0700

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

Change-Id: I463890545871eb375594afbff3451c279ca46af4