tree 886b41e69c0e5da017b1f7a210648aa9c45b5f21
parent 36812cec765785f80d23be5495ab499104975e4f
parent 756dafc33b350fc8673f6dfe4a10172299d1a42d
author Jean-Baptiste Queru <jbq@google.com> 1359476505 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359476505 -0800

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

# Via Jean-Baptiste Queru
* commit '756dafc33b350fc8673f6dfe4a10172299d1a42d':
  Generate blob list for tilapia.