am b2d30f98: (-s ours) am bf5ae628: (-s ours) Android SDK Windows USB driver: Glass PID. DO NOT MERGE.

* commit 'b2d30f98cfa12b17926e9015bfdbb6b2f8c1ddaa':
  Android SDK Windows USB driver: Glass PID. DO NOT MERGE.