OSDN Git Service
(root)
/
android-x86
/
sdk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
610a758
5a2bee2
)
Merge remote branch 'goog/master' into HEAD
author
Xavier Ducrohet
<xav@android.com>
Wed, 24 Feb 2010 01:51:46 +0000
(17:51 -0800)
committer
Xavier Ducrohet
<xav@android.com>
Wed, 24 Feb 2010 01:51:46 +0000
(17:51 -0800)
1
2
eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ApkBuilder.java
patch
|
diff1
|
diff2
|
blob
|
history
files/android_rules.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ApkBuilder.java
Simple merge
diff --cc
files/android_rules.xml
Simple merge
OSDN Git Service
