tree 5b8b7a07e5f146b796f39218853676e821a9f7ff
parent 27d3cfb0b78d8e4fdb2840e5555e9556d7313d20
parent 788a634f3f085ef6a85717c0f5733996bbb24387
author Jerry Zhang <zhangjerry@google.com> 1508272727 +0000
committer android-build-merger <android-build-merger@google.com> 1508272727 +0000

Merge "Add MTP and PTP OS descriptors." am: 159158c3cd am: 735d9100a1 am: fcd0cd6ed2
am: 788a634f3f

Change-Id: Iceca23f2243dcb138b073712ca7b3b63fdb6fa72