Zach Jang 12db224269 resolve merge conflicts of 24cfbfa to lmp-dev ... Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132		2016-06-21 18:13:17 -07:00
core	resolve merge conflicts of 24cfbfa to lmp-dev	2016-06-21 18:13:17 -07:00
libs/host	Support host multilib build	2014-05-14 16:55:04 -07:00
target	Bump generic_x86_64 system partition size - DO NOT MERGE	2015-03-18 21:04:14 +00:00
tools	am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3	2015-09-17 20:16:43 +00:00
.gitignore	Delete .swp file added by accident.	2014-07-22 17:42:35 -07:00
CleanSpec.mk	am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3	2015-09-17 20:16:43 +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