OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6d3464 1529e14)
Merge "resolved conflicts for merge of fb339016 to master"
authorAdam Powell <adamp@google.com>
Thu, 9 Jun 2011 20:16:50 +0000 (13:16 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 9 Jun 2011 20:16:50 +0000 (13:16 -0700)

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