| commit | ebfd9306c19de27fd4ac366a9ff9eb008db52a25 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Sat Jun 21 19:53:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 21 19:53:11 2014 +0000 |
| tree | 325cc206d84d8edd9e5c472890af6f010d1fd6b4 | |
| parent | b7911835331d1a96c0f524947daa652ad813ec1a [diff] | |
| parent | 767f57dcaf7eedc012981a52f14e0ba7a286587f [diff] |
am 767f57dc: resolved conflicts for 8062092a * commit '767f57dcaf7eedc012981a52f14e0ba7a286587f': Update revision of Android SDK USB driver for Windows. DO NOT MERGE.