Ying Wang 133415d551 am 4acabe0f: resolved conflicts for merge of f5b9830b to stage-aosp-master ... * commit '4acabe0fd8778aad079ed4b3a9bbe011db12ece3': Better way to package up the otatools-package.		2015-04-09 00:31:56 +00:00
core	am 4acabe0f: resolved conflicts for merge of f5b9830b to stage-aosp-master	2015-04-09 00:31:56 +00:00
libs/host	Remove HAVE_SYMLINKS.	2015-01-12 17:21:01 -08:00
target	am 4e94ed11: am 2d47488e: Merge "Drop BOARD_SEPOLICY_UNION."	2015-04-01 18:05:29 +00:00
tools	am bf2474fb: am 011a50e4: Merge changes I75d472ed,I6d681071	2015-04-07 16:58:02 +00:00
.gitignore	Delete .swp file added by accident.	2014-07-22 17:42:35 -07:00
CleanSpec.mk	resolved conflicts for merge of 6d607ee7 to lmp-mr1-dev-plus-aosp	2015-03-26 18:03:17 -07:00
buildspec.mk.default	Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG	2013-07-25 15:52:17 -07:00
envsetup.sh	Include vendorsetup scripts in order	2015-04-03 11:58:09 +02:00