Zach Jang bf5d08ecf4 Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad ... am: 7cc20fe0a0 * commit '7cc20fe0a058f3e2e323da12b0d5eb3c5d6311cb': Updating security string to 2016-07-05 Change-Id: I365f9fb0c5e2a29bbf93ea6476d3d697998b90b3		2016-05-25 20:39:28 +00:00
core	Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad	2016-05-25 20:39:28 +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