OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20b571f 6b4abeb)
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)
* commit '863ee40964ef2a017a1116abe37c6b8ad466dd5e':
  DO NOT MERGE Fix media scanner uri handling.


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help