OSDN Git Service

(root) / android-x86 / frameworks-native.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit920f3d885ad35caa6c3ed83a1c9f71c21903e1b5
treee72cd4d92c95c1933c8c4f8f57eee6fb45bc133ctree | snapshot
parent918428162f5e6dca4015bcc778c91837fad330ddcommit | diff
parentec1ddffd0a124773a39ad1a1fb2a638fb6b251eccommit | diff
resolved conflicts for merge of 6ba69734 to eclair, skipping preloaded-classes as pre Bob
frameworks/native
About OSDN
Find Software
Develop Software
Help