Ying Wang 4a712bfb6f resolved conflicts for merge of 70190a2b to klp-dev-plus-aosp ... Change-Id: I9abcb4e258ad95912860dcae2973c4e417b05369		2013-09-19 10:15:38 -07:00
..
arch	resolved conflicts for merge of 70190a2b to klp-dev-plus-aosp	2013-09-19 10:15:38 -07:00
include/arch	Remove HAVE_DLADDR from AndroidConfig.h.	2013-01-25 15:57:40 -08:00
HOST_darwin-x86.mk	Don't try to group static libraries on mac.	2013-03-11 14:59:42 +00:00
HOST_linux-x86.mk	am e2f7bd46: am c148cca6: Merge "Specify -msse3 on host as on target."	2013-02-27 19:03:54 +00:00
HOST_windows-x86.mk	Added BUILD_HOST_static to build statically linked executable/shared-lib	2012-08-21 14:40:16 +08:00
javac.mk	Fix the build: properly detect the BUILD OS version of Java, not the host one.	2010-06-12 11:44:48 -07:00
select.mk	select.mk: Tune ccache options	2012-08-16 11:11:29 -07:00
TARGET_linux-arm.mk	am db4113fd: am d58df2de: Merge "Re-tighten default compiler options."	2013-08-28 11:32:25 -07:00
TARGET_linux-mips.mk	am 3208b615: am fc8b6338: resolved conflicts for merge of d65a7da3 to jb-mr2-dev-plus-aosp	2013-08-15 14:42:57 -07:00
TARGET_linux-x86.mk	resolved conflicts for merge of 70190a2b to klp-dev-plus-aosp	2013-09-19 10:15:38 -07:00