No description

Bart Sears c3868ae371 resolved conflicts for merge of 6d607ee7 to lmp-mr1-dev-plus-aosp ... Change-Id: I0a49bf5492cd5c1b03cf8cddd219db326d586909		2015-03-26 18:03:17 -07:00
core	resolved conflicts for merge of 6d607ee7 to lmp-mr1-dev-plus-aosp	2015-03-26 18:03:17 -07:00
libs/host	Remove HAVE_SYMLINKS.	2015-01-12 17:21:01 -08:00
target	am 23588104: am 971e5787: Merge "Revert "Replace legacy Browser with BookmarkProvider""	2015-03-20 21:24:37 +00:00
tools	am abc748c1: am 6ff1b035: Merge "Support to build image of root file system with /system and ramdisk combined."	2015-03-26 17:57:22 +00:00
.gitignore	Delete .swp file added by accident.	2014-07-22 17:42:35 -07:00
buildspec.mk.default	Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG	2013-07-25 15:52:17 -07:00
CleanSpec.mk	resolved conflicts for merge of 6d607ee7 to lmp-mr1-dev-plus-aosp	2015-03-26 18:03:17 -07:00
envsetup.sh	am 6492792d: Merge "Consult tput about color control sequence support"	2015-03-03 19:02:37 +00:00