tree 325cc206d84d8edd9e5c472890af6f010d1fd6b4
parent b7911835331d1a96c0f524947daa652ad813ec1a
parent 767f57dcaf7eedc012981a52f14e0ba7a286587f
author Ed Heyl <edheyl@google.com> 1403380391 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403380391 +0000

am 767f57dc: resolved conflicts for 8062092a

* commit '767f57dcaf7eedc012981a52f14e0ba7a286587f':
  Update revision of Android SDK USB driver for Windows. DO NOT MERGE.