OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c05413f 76e8b77)
resolved conflicts for merge of 1a783be3 to master
authorJim Miller <jaggies@google.com>
Fri, 18 Nov 2011 21:56:20 +0000 (13:56 -0800)
committerJim Miller <jaggies@google.com>
Fri, 18 Nov 2011 21:56:20 +0000 (13:56 -0800)
Change-Id: Ibaff3547ac51250fe40adf3aa06d6a30ecfcef54


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