Dan Albert e959b89247 am 71629967: resolved conflicts for merge of 96c22133 to lmp-mr1-dev-plus-aosp ... * commit '7162996734fbd2b3c0aaf63db842f2fc48bc95bb': Add support for ASAN in host modules.		2014-10-20 20:47:39 +00:00
core	am 71629967: resolved conflicts for merge of 96c22133 to lmp-mr1-dev-plus-aosp	2014-10-20 20:47:39 +00:00
libs/host	Support host multilib build	2014-05-14 16:55:04 -07:00
target	am 63cea7b2: am a6f16533: am 4543ae81: Merge "Add Cutive Mono to makefiles" into lmp-dev	2014-10-11 05:07:32 +00:00
tools	am 597bfe1e: am 327180f5: Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev	2014-10-17 20:29:02 +00:00
.gitignore	Delete .swp file added by accident.	2014-07-22 17:42:35 -07:00
CleanSpec.mk	am 374712c5: Merge "Move up to API 21, Lollipop MR1." into lmp-mr1-dev	2014-10-17 17:19:57 +00:00
buildspec.mk.default	Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG	2013-07-25 15:52:17 -07:00
envsetup.sh	Call art-on only when debugging ART processes.	2014-10-05 10:41:41 -07:00