tree 3271222b09eabcb0c82eb072c76b7a3d8b455a87
parent a9eddb988ca6ad9b32eaa7316496f4fca95855a2
parent f5e5e76065d9dbc6f2334e4bee4af233aaebc14a
author Jean-Baptiste Queru <jbq@google.com> 1360012601 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360012601 -0800

am f5e5e760: resolved conflicts for merge of 16e6db4c to jb-mr1-dev-plus-aosp

# Via Android Git Automerger (2) and Jean-Baptiste Queru (2)
* commit 'f5e5e76065d9dbc6f2334e4bee4af233aaebc14a':
  Don't delete tilapia files when preparing blob lists.