OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 37100fa d5f8e3b)
Merge "Resolve merge conflict for '75f1fdec':"
authorMike Lockwood <lockwood@android.com>
Thu, 4 Aug 2011 16:46:09 +0000 (09:46 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 4 Aug 2011 16:46:09 +0000 (09:46 -0700)

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