OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d8ba4a 5b41774)
am 2dc7c6c4: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 May 2010 16:22:21 +0000 (09:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 May 2010 16:22:21 +0000 (09:22 -0700)
Merge commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d' into kraken

* commit '2dc7c6c4153380fc64b99d37d763d3f0d1cac04d':
  Add and document .nomedia constant for MediaStore (Issue 6365)


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