Colin Cross 2afade582d resolve merge conflicts of da00e137ec to stage-aosp-master ... Change-Id: Ie81c0f4f5f14ae3e51ee717a50d0c29b26161b90		2017-03-15 10:20:24 -07:00
core	resolve merge conflicts of da00e137ec to stage-aosp-master	2017-03-15 10:20:24 -07:00
target	Merge "configstore: add default implementation of configstore@1.0 HAL"	2017-03-14 06:50:30 +00:00
tools	Merge "releasetools: Fix the diff_worker progress report."	2017-03-13 19:12:26 +00:00
.gitignore	Add build subprojects to .gitignore	2015-07-23 13:18:47 -07:00
Android.mk	Add new Android.mk to handle repo move	2016-06-16 15:30:19 -07:00
CleanSpec.mk	install *.so in different paths for their types	2017-03-13 08:27:09 +09:00
buildspec.mk.default	Fix GET-INSTALL-PATH to work with Soong	2016-08-12 05:10:51 +00:00
envsetup.sh	Fix stacks on 64 bit processes.	2017-03-01 11:34:58 -08:00