tree 6c4e58cbd1f0a6caf5ad4ed47c47d4bfadb4ab7a
parent 201bc41e0cbb07dba5365f33ba9885c02977ed6a
parent 6ad9cc9afd1229db0ee68a889979feffbbcba557
author Justin Ho <justinho@google.com> 1300258040 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300258040 -0700

am 6ad9cc9a: am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1

* commit '6ad9cc9afd1229db0ee68a889979feffbbcba557':
  Integrating new ADB USB debugging asset Bug: #6699FF