OSDN Git Service

(root) / android-x86 / sdk.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bf272a5 d885f0e)
Merge remote branch 'goog/master' into HEAD
authorXavier Ducrohet <xav@android.com>
Sat, 13 Feb 2010 01:23:36 +0000 (17:23 -0800)
committerXavier Ducrohet <xav@android.com>
Sat, 13 Feb 2010 01:23:36 +0000 (17:23 -0800)
commit4338bb72c64fa2bd41998a8bd13fe21fcdc2d47b
tree1347a0824f82f55f719f74b672950781e8db109ctree | snapshot
parentbf272a5feaa639e5bc32532733ae0745368c6b00commit | diff
parentd885f0e83df714072d8357df2429e43cca95c039commit | diff
Merge remote branch 'goog/master' into HEAD

Conflicts:
eclipse/plugins/com.android.ide.eclipse.adt/.classpath
eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
eclipse/plugins/com.android.ide.eclipse.adt/build.properties
eclipse/plugins/com.android.ide.eclipse.tests/.classpath

Change-Id: I4013ba2d22e5b602329534ff602c7a7e7ce38567
eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF diff1 | diff2 | blob | history
eclipse/plugins/com.android.ide.eclipse.tests/.classpath diff1 | diff2 | blob | history
sdk
About OSDN
Find Software
Develop Software
Help