tree fe010eb3b36e14337324f104c0f188925dd6937b
parent d20b4cfde2848052cf93ed13df14d75347ec64fd
parent d32114950770a6e9361e0869a41e5a03a7acab42
author Mike Lockwood <lockwood@android.com> 1284476729 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1284476729 -0700

Merge changes I28b846a3,Ifd9b48cb

* changes:
  MediaScanner: Fix problems with scanner non-file objects from the database
  MTP: Delete all files and subdirectories when deleting directories.