Ying Wang 9f42af5bbc resolved conflicts for merge of a8df6091 to master ... Change-Id: I2d088c09738b34f72c2efa030304fca28ad0e791		2012-07-23 19:49:48 -07:00
core	resolved conflicts for merge of a8df6091 to master	2012-07-23 19:49:48 -07:00
libs/host	Use %zd instead of %d for variables of type ssize_t	2012-02-27 16:06:00 -08:00
target	add TestingCamera to mini for generic PDK	2012-07-16 12:15:54 -07:00
tools	am a24cd5eb: am b72b7b84: Merge "docs: further specify design docs\' list styles to fix uls appearing like ols" into jb-dev	2012-07-19 11:14: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