tree 219bad973dd1af80c377bb8e9e5355e70b843bac
parent 3de30a4c1e48d92af14154abddd4fb6fe0c6aa13
parent ac36d7c715a9cd793b2dce6de547594810101c3a
author Mike Lockwood <lockwood@android.com> 1299772230 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1299772230 -0800

Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1