OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 231fcec aeac73b)
Merge "resolved conflicts for merge of 4b1a37d7 to master"
authorWink Saville <wink@google.com>
Fri, 8 Apr 2011 22:25:14 +0000 (15:25 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 8 Apr 2011 22:25:14 +0000 (15:25 -0700)

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