tree da74de5895da6e105e6828c10bab2d96c4548741
parent 759bd5864b09a3a6206136a1d36d0e578e498814
parent 5c2bfc929bf2547f4ef2c70518ed4172a2fe31ec
author Jean-Baptiste Queru <jbq@google.com> 1354903078 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354903078 -0800

am 5c2bfc92: Merge "auto-generated blob list" into jb-mr1.1-dev

* commit '5c2bfc929bf2547f4ef2c70518ed4172a2fe31ec':
  auto-generated blob list