tree d2ac280b4ff79583b48d2f38005483da55bf383a
parent 7ccc5a3f0604adf6fc6994c824ef10d380ae0a92
parent a79ae447e21d6b70fdbb47fb931dad2a07d87a44
author Marco Nelissen <marcone@google.com> 1323741690 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323741690 -0800

am a79ae447: am 7f36494e: Speed up media scan by caching parent directories

* commit 'a79ae447e21d6b70fdbb47fb931dad2a07d87a44':
  Speed up media scan by caching parent directories