Yohann Roussel f9a27f45b4 Fix host_dalvik_java_library with Jack ... Looks like this was a bad conflict resolution. Change-Id: I7d2f3d51f1d6d9219ebec6c9342e17051c763168		2015-01-26 16:14:43 +01:00
core	Fix host_dalvik_java_library with Jack	2015-01-26 16:14:43 +01:00
libs/host	Remove HAVE_SYMLINKS.	2015-01-12 17:21:01 -08:00
target	am 79834f37: am ae542c78: Merge "Revert "Add the default local_time hal implementation to builds.""	2015-01-22 19:58:04 +00:00
tools	am 675a726f: resolved conflicts for merge of 8f5fc9e2 to lmp-mr1-dev-plus-aosp	2015-01-22 19:58:04 +00:00
.gitignore	Delete .swp file added by accident.	2014-07-22 17:42:35 -07:00
CleanSpec.mk	Update version to MNC.	2015-01-22 16:36:55 -08:00
buildspec.mk.default	Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG	2013-07-25 15:52:17 -07:00
envsetup.sh	am 23396bfc: Merge "gdbclient: Improve error handling"	2015-01-23 00:50:38 +00:00