am 354634b8: am 129c2dbb: am 7a8cfbfd: am b63c1328: am 55089c32: Merge "Android SDK Windows USB driver: Glass PID."

* commit '354634b8bbd4dc8a15dd91082d4debfb57257c81':