tree c7f934cfeb01deaa1f03a6686010b08a45fe4cb4
parent 20e0594a8deef6d308c6b61e037aa0a40ce1404f
parent 3cb57672cefbe78bf89590fb3053b4ab4ecd461b
author Martijn Coenen <maco@google.com> 1337208877 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337208877 -0700

am 3cb57672: Merge "Don\'t MediaScan files received through handover." into jb-dev

* commit '3cb57672cefbe78bf89590fb3053b4ab4ecd461b':
  Don't MediaScan files received through handover.