tree cc30c433b77d450c9970e7d85758bb51ea90720d
parent 2480debbb932d211008780ba30988c3e3977a3fe
parent 99e6fe864874dcb5aa86100948544f0de3577df0
author Jean-Baptiste Queru <jbq@google.com> 1354903155 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354903155 -0800

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

* commit '99e6fe864874dcb5aa86100948544f0de3577df0':
  auto-generated blob list