tree 5a46f118a7f05da39b068489b61209ec63f23034
parent 45df6a2a25ff36606a5301155d8d97e9bf80d00b
parent 4ac3585263ad59def5cf14756347cecab43e6e67
author The Android Open Source Project <initial-contribution@android.com> 1273855571 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273855571 -0700

am 1d628c5d: merge from open-source master

Merge commit '1d628c5d3dd7998b29c339292a2dc391015d0782' into kraken

* commit '1d628c5d3dd7998b29c339292a2dc391015d0782':
  Accept media files by file extension in case insensitive manner.