tree 972678478fd949bb26aed4290d839adc3560e1f2
parent 1bf4543ffb8e081d5d3b1d8dbfcb98d5129c2887
parent 159158c3cd9f39089c1d60650776b1d9d2180d9e
author Jerry Zhang <zhangjerry@google.com> 1508205422 +0000
committer android-build-merger <android-build-merger@google.com> 1508205422 +0000

Merge "Add MTP and PTP OS descriptors."
am: 159158c3cd

Change-Id: Ib487d3521c4aab29ad2d188ee568b42b07f76325