OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a87feb9 e121cd7)
resolved conflicts for merge of 7ca13deb to master
authorJake Hamby <jhamby@google.com>
Thu, 9 Jun 2011 06:20:09 +0000 (23:20 -0700)
committerJake Hamby <jhamby@google.com>
Thu, 9 Jun 2011 06:20:09 +0000 (23:20 -0700)
Change-Id: If34814d6c70cf63eca9bd816845389f6785518ae


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