OSDN Git Service

am 863ee409: (-s ours) am 7dd59229: DO NOT MERGE Fix media scanner uri handling.
authorMarco Nelissen <marcone@google.com>
Wed, 4 May 2011 19:46:57 +0000 (12:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 May 2011 19:46:57 +0000 (12:46 -0700)
commit614a822d874d8e686ee0263b36fda25b46ac8c51
tree6fa9206a9b1028672f44ec63fb27853b20b083eb
parent20b571fd817d6903fbc3db8556d105efd898d073
parent6b4abeb8b39bc7fa9d1a5ad34c0bf95d6cd7cf79
am 863ee409: (-s ours) am 7dd59229: DO NOT MERGE Fix media scanner uri handling.

* commit '863ee40964ef2a017a1116abe37c6b8ad466dd5e':
  DO NOT MERGE Fix media scanner uri handling.