OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7074509 5eb2395)
resolved conflicts for merge of 5a726729 to gingerbread
authorScott Main <smain@google.com>
Wed, 10 Nov 2010 22:46:44 +0000 (14:46 -0800)
committerScott Main <smain@google.com>
Wed, 10 Nov 2010 22:46:44 +0000 (14:46 -0800)
Change-Id: I6060f31c45d49dfe4dbda52836150311b8992b15


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