OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b0e7f8 64bc0f2)
resolved conflicts for merge of 99cd6671 to master
authorWink Saville <wink@google.com>
Tue, 12 Jul 2011 20:56:05 +0000 (13:56 -0700)
committerWink Saville <wink@google.com>
Tue, 12 Jul 2011 20:56:05 +0000 (13:56 -0700)
Change-Id: I81ac18b1b8291a96bdfa3386f2fe3633fd7eeb79


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