Adam Seaton cf896d4bcb Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 ... am: 2596931e86 Change-Id: I3084760ec275de17fa024379decf98303799e213		2017-04-12 23:07:46 +00:00
core	Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926	2017-04-12 23:07:46 +00:00
libs/host	Remove HAVE_SYMLINKS.	2015-01-12 17:21:01 -08:00
target	Shorten TARGET_BRAND from generic_<arch> to Android	2015-11-24 18:51:59 +00:00
tools	DO NOT MERGE rangelib.py: Fix the bug in monotonic check.	2016-05-13 22:39:07 +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