tree f10bce481300d3bc32b918bf174931f4935e1baa
parent cf842a81c3b36ae5efd82933b203efd3d90ed02e
parent bfa8aaefb35aff3865c0ad7d285bf10209db35ee
author Jean-Baptiste Queru <jbq@google.com> 1329408194 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329408194 -0800

am bfa8aaef: (-s ours) am 306fd7fd: auto-generated blob list

* commit 'bfa8aaefb35aff3865c0ad7d285bf10209db35ee':
  auto-generated blob list