OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66e3e12 8166de6)
Merge "resolved conflicts for merge of a7f68230 to master"
authorRobert Greenwalt <rgreenwalt@google.com>
Tue, 26 Jul 2011 00:12:22 +0000 (17:12 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 26 Jul 2011 00:12:22 +0000 (17:12 -0700)

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