tree caa46feab197e65bd623449432a44735f254abbf
parent 0d26ebe63849e0d6cf491925146e43b94d6820ab
parent 532ae77972f66feecc96ae31b771cf6f68fd6556
author Mike Lockwood <lockwood@android.com> 1294871478 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1294871478 -0800

am 532ae779: Revert "Allow _DELETE_FILE trigger to delete files in /data/media"

* commit '532ae77972f66feecc96ae31b771cf6f68fd6556':
  Revert "Allow _DELETE_FILE trigger to delete files in /data/media"