Ben Cheng 9c68f06a54 Merge commit 'ec4caba7' into manualmerge ... Conflicts: CleanSpec.mk Change-Id: Idd8f8f4a896b47bd6275daeb71a24a317da4c98a		2012-12-13 11:03:58 -08:00
core	Merge commit 'ec4caba7' into manualmerge	2012-12-13 11:03:58 -08:00
libs/host	Use %zd instead of %d for variables of type ssize_t	2012-02-27 16:06:00 -08:00
target	am f28aae60: am abc791fc: am 801a0792: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev	2012-12-03 18:01:14 -08:00
tools	am 297e28a9: am a7b85086: Merge "Export TARGET_GCC_VERSION as an env variable."	2012-12-10 17:36:35 -08:00
.gitignore	…
CleanSpec.mk	Merge commit 'ec4caba7' into manualmerge	2012-12-13 11:03:58 -08:00
buildspec.mk.default	Remove the simulator target from all makefiles.	2011-07-11 23:51:37 -07:00
envsetup.sh	am b3a68f6e: am 62f1d86e: Merge "Define TARGET_GCC_VERSION in target specific make files."	2012-12-11 16:53:05 -08:00