git.osdn.net Git - android-x86/build.git/commitdiff

author	Ying Wang <wangying@google.com>
	Sun, 3 Oct 2010 03:08:55 +0000 (20:08 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Sun, 3 Oct 2010 03:08:55 +0000 (20:08 -0700)

Merge commit 'a9c381ed4517993175a5bb6741ecf2aac3e8040c' into gingerbread-plus-aosp

* commit 'a9c381ed4517993175a5bb6741ecf2aac3e8040c':
Any intermediate targets between Progaurd and the built_dex should be differently named.

		1	2
core/base_rules.mk	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

build

About OSDN

Find Software

Develop Software

Help