tree 6a6fc92cfcce758d234b2d4caced0f51590bd412
parent a1e876c054e608d7f9b014a31f129608e492953c
parent 71e23bec393ce3930822c1224ffad80f2918a957
author Jean-Baptiste Queru <jbq@google.com> 1359757544 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359757544 -0800

am 71e23bec: am 7541807f: Don\'t delete tilapia files when preparing blob lists.

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