Jerry Zhang 42f4815eff Merge "Remove ptp from persist config on boot" into oc-dev am: 1d1cf13056 ...

am: 8d5570b9e1

Change-Id: I792ed0959e5a24ef8893a1bd63e3a33278462556

2017-06-05 18:54:08 +00:00

..

com/android/server/usb

Merge "Remove ptp from persist config on boot" into oc-dev am: 1d1cf13056

2017-06-05 18:54:08 +00:00