tree f0c5385f93124166b4ba68876aad964b56b512bc
parent 76e47e0ec84eaf7faf6f77b853ba74345875a8e3
parent 007b70023b179f846c0ad1f0303da4ce03ac065e
author Jean-Baptiste Queru <jbq@google.com> 1335996844 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335996844 -0700

am 007b7002: am 2ae9878c: am c5d5a5e8: Merge "Kindle Fire USB ID"

* commit '007b70023b179f846c0ad1f0303da4ce03ac065e':
  Kindle Fire USB ID