Adam Seaton a34ba7f284 Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 ... am: d236029c61 Change-Id: I229eadd885c5a292ef0f7536b15d950251fdd3bb		2017-04-12 23:29:53 +00:00
core	Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86	2017-04-12 23:13:16 +00:00
libs/host	Remove HAVE_SYMLINKS.	2015-01-12 17:21:01 -08:00
target	remove Exchange2 from core.mk	2015-12-09 12:21:49 -08: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