Zach Jang e7bc1542db resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 ... am: 3749025ccb Change-Id: Idadb32ede7b3699e0db8ce632d37e7d2cf99e82b		2016-06-22 01:38:31 +00:00
core	resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2	2016-06-22 01:38:31 +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	Fix issie #23116383: Include security patch level in Settings	2015-08-12 16:29:08 -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