OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c33daa 9dc9863)
am ba492eb6: am 278a04eb: Merge "Fix javadoc for MediaStore.Files.FileColumns constan...
authorMike Lockwood <lockwood@android.com>
Thu, 27 Jan 2011 03:07:34 +0000 (19:07 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Jan 2011 03:07:34 +0000 (19:07 -0800)
* commit 'ba492eb636a45cd5686fb0e6eb807e3deaa500fb':
  Fix javadoc for MediaStore.Files.FileColumns constants


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