tree 0e132469f381b6bc4bf393c8067032787d331c2b
parent 25c07ac7ce0eff306fd2bf277f15a8588000c2ea
parent 85ab8f559ec2f8fefb8957633af524b31c75d15a
author Elliott Hughes <enh@google.com> 1428107682 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428107682 +0000

am 3a4aedfc: Merge "sdcard: Properly handle deleted nodes"

* commit '3a4aedfcd3354b903aa48a836cb55ee01db9f896':
  sdcard: Properly handle deleted nodes