tree 69e60d8d5071c6f703efa833088e87143921caed
parent 9bcc52197722ec9c75913e60a102a40dd6f4fa49
parent 91ca8952dc3268183526c5192ee43eb0191ffda4
author Marco Nelissen <marcone@google.com> 1337814730 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337814730 -0700

am 91ca8952: Merge "Add media provider/scanner tests" into jb-dev

* commit '91ca8952dc3268183526c5192ee43eb0191ffda4':
  Add media provider/scanner tests