OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44fe74c c15de03)
resolved conflicts for merge of 9b7dba93 to eclair-mr2
authorMike Lockwood <lockwood@android.com>
Thu, 3 Dec 2009 00:57:33 +0000 (19:57 -0500)
committerMike Lockwood <lockwood@android.com>
Thu, 3 Dec 2009 00:57:33 +0000 (19:57 -0500)
Change-Id: I9a5412b8812aebc934540b1f6f9a9f9c96d89f59


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