OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9184281 ec1ddff)
resolved conflicts for merge of 6ba69734 to eclair, skipping preloaded-classes as...
authorAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Aug 2009 20:08:40 +0000 (13:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Aug 2009 20:08:40 +0000 (13:08 -0700)

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