OSDN Git Service

(root) / android-x86 / development.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5a48825 17c61aa)
resolved conflicts for merge of 17c61aaf to master
authorJean-Baptiste Queru <jbq@google.com>
Sat, 24 Jul 2010 01:51:47 +0000 (18:51 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Sat, 24 Jul 2010 01:51:47 +0000 (18:51 -0700)
commitcfb814bd817511eae4ed0c47113fc111c652ffdf
tree703a2ce182671206ad16a0946a5ad380db08e197tree | snapshot
parent5a48825cc0e90dc5386a539f83aa4dcf249b8d53commit | diff
parent17c61aaf4607f89e512d883c210cfcc0dc042f4fcommit | diff
resolved conflicts for merge of 17c61aaf to master

Change-Id: I288054a9e6997ec3e8e2906058b83c7d629a239a
ide/eclipse/.classpath diff1 | diff2 | blob | history
development
About OSDN
Find Software
Develop Software
Help