OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d0610b 94bf8d2)
Merge "resolved conflicts for merge of 31796297 to master"
authorDaniel Sandler <dsandler@google.com>
Mon, 7 Feb 2011 21:14:52 +0000 (13:14 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 7 Feb 2011 21:14:52 +0000 (13:14 -0800)

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