tree 24765e945c1f723967586f7ebec8c8d79e782757
parent ace1fbfcd2ada1b309cc49b7b1a6d9e57fea7163
parent f14d7bdcff9114adcf267a9cf11b0550db0bdb47
author Jean-Baptiste Queru <jbq@google.com> 1329326266 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329326266 -0800

am f14d7bdc: (-s ours) am 16316f1e: am 7e9873d3: auto-generated blob-handling scripts

* commit 'f14d7bdcff9114adcf267a9cf11b0550db0bdb47':
  auto-generated blob-handling scripts