OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 162d046 a61fed0)
resolved conflicts for merge of c402def7 to master
authorJames Dong <jdong@google.com>
Thu, 9 Dec 2010 01:14:14 +0000 (17:14 -0800)
committerJames Dong <jdong@google.com>
Thu, 9 Dec 2010 01:14:14 +0000 (17:14 -0800)
Change-Id: I328e7c41ad410f07322f6d3a32251e495710c090


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