tree 41f956edfc9995ea0b2054dd9e5ed3e259f345f7
parent e247023e785e581349d8fb926c4a1bed239b623c
parent 95ea161b05040412d95b5add98dc882e3be4075c
author Jerry Zhang <zhangjerry@google.com> 1504736714 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1504736714 +0000

Merge "Add MTP and PTP OS descriptors."