tree 3716544324222f48718ca0131c0213393eb193f8
parent bac11fdbfc57ef09dafb80710b8db1542eb4d88e
parent 3d65dcbcec75bd53bb9da6ecebcb9dccc8eb42c7
author Jeff Sharkey <jsharkey@google.com> 1443644850 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443644850 +0000

am 3d65dcbc: am 58843059: am e69ff2a8: Merge "Clean stale entries when deleting files." into mnc-dr-dev

* commit '3d65dcbcec75bd53bb9da6ecebcb9dccc8eb42c7':
  Clean stale entries when deleting files.