The Android Open Source Project 2db5636452 am d1b25b86: (-s ours) Reconcile with jb-mr1.1-release - do not merge ... * commit 'd1b25b86ad8eca832ccb1af43e3992d9441b8bfc': JDP75 JDP74 JDP73		2012-12-14 16:48:43 -08:00
core	Merge "Build from source or prebuilt"	2012-12-14 14:52:16 -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 0adc185a: am 9eedd3ab: Merge "Use "\cd" to disable alias temporarily."	2012-12-13 18:00:14 -08:00