OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec44978 72b44cf)
Merge "resolved conflicts for merge of 61bb25f2 to master"
authorEric Laurent <elaurent@google.com>
Thu, 11 Feb 2010 19:16:36 +0000 (11:16 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 11 Feb 2010 19:16:36 +0000 (11:16 -0800)

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