OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c025ca 19a87be)
Merge "resolved conflicts for merge of 1a783be3 to master"
authorJim Miller <jaggies@google.com>
Fri, 18 Nov 2011 22:44:50 +0000 (14:44 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 18 Nov 2011 22:44:50 +0000 (14:44 -0800)

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