tree ba9bca6d4ffa54e4c8583e99a1521665e37c4eea
parent eed821e952e45d680557f71da180dc86c9ea92e1
parent 2ae9878cd5dc517cc7338aaca81f0eb3127b4a53
author Jean-Baptiste Queru <jbq@google.com> 1335996668 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335996668 -0700

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

* commit '2ae9878cd5dc517cc7338aaca81f0eb3127b4a53':
  Kindle Fire USB ID