tree 3271222b09eabcb0c82eb072c76b7a3d8b455a87
parent 4d1352f29f92127a503eee7504174055a47ede3c
parent 77059769ca8f5c20015f521ca8c17e810959183e
author Jean-Baptiste Queru <jbq@google.com> 1359476618 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359476618 -0800

am 77059769: am 756dafc3: resolved conflicts for merge of b376b2cc to jb-mr1-aah-dev

# Via Jean-Baptiste Queru (2) and Android Git Automerger (1)
* commit '77059769ca8f5c20015f521ca8c17e810959183e':
  Generate blob list for tilapia.