Jean-Baptiste Queru 6e207824af resolved conflicts for merge of 572d0d7d to jb-dev-plus-aosp ... Change-Id: I6c750adcf06457bf8a3b47423c990be6e9d23bbb		2012-06-13 07:42:04 -07:00
core	resolved conflicts for merge of 572d0d7d to jb-dev-plus-aosp	2012-06-13 07:42:04 -07:00
libs/host	Use %zd instead of %d for variables of type ssize_t	2012-02-27 16:06:00 -08:00
target	resolved conflicts for merge of 76af0657 to jb-dev-plus-aosp	2012-06-12 14:57:27 -07:00
tools	am b53a073d: am e375c940: Merge "SDK: Use "strip -x" for atree."	2012-06-07 13:08:58 -07:00
.gitignore	add a .gitignore file to make git ignore *.pyc files	2010-01-22 10:23:45 -08:00
CleanSpec.mk	am e534e2eb: am 47450542: Merge "Use Mac OS X SDK 10.6."	2012-06-05 15:25:39 -07:00
buildspec.mk.default	Remove the simulator target from all makefiles.	2011-07-11 23:51:37 -07:00
envsetup.sh	resolved conflicts for merge of 62855a83 to jb-dev-plus-aosp	2012-05-16 13:18:39 -07:00