OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2209d0 61be264)
resolved conflicts for merge of ca48433a to master
authorJean-Baptiste Queru <jbq@google.com>
Tue, 20 Jul 2010 17:40:17 +0000 (10:40 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 20 Jul 2010 17:40:17 +0000 (10:40 -0700)
Change-Id: I0dd2dee65ff72b7eae20019c6232b66388fe7990


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