Zach Jang 9fc3cf7ba2 resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 ... am: cbf1e2cc94 Change-Id: I72cff95d6f8878b5d3707f0b0f9c0541c89b9aa5		2016-06-22 01:33:23 +00:00
core	resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29	2016-06-22 01:33:23 +00:00
libs/host	Remove HAVE_SYMLINKS.	2015-01-12 17:21:01 -08:00
target	Really include drawables for all densities.	2015-09-29 09:57:41 -07:00
tools	Merge "DO NOT MERGE releasetools: Always write the last block if it's padded." into mnc-dev	2015-10-17 01:15:39 +00:00
.gitignore	Delete .swp file added by accident.	2014-07-22 17:42:35 -07:00
CleanSpec.mk	resolved conflicts for b161297d to lmp-mr1-ub-dev	2015-09-21 13:00:04 -07:00
buildspec.mk.default	Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG	2013-07-25 15:52:17 -07:00
envsetup.sh	Use $OUT_DIR/filelist when OUT_DIR is set	2015-09-30 20:36:15 -07:00