OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7492c0 df25902)
resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp
authorJake Hamby <jhamby@google.com>
Tue, 7 Jun 2011 23:24:15 +0000 (16:24 -0700)
committerJake Hamby <jhamby@google.com>
Tue, 7 Jun 2011 23:24:15 +0000 (16:24 -0700)
Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a


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