Christopher Ferris 46ba5456ad am 708b56ed: Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty." ... * commit '708b56edc879847f418108cf360bc990bb2a502a': Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.		2015-03-07 17:09:20 +00:00
core	am 708b56ed: Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty."	2015-03-07 17:09:20 +00:00
libs/host	Remove HAVE_SYMLINKS.	2015-01-12 17:21:01 -08:00
target	am 58aeaed9: Merge "goldfish_logcat: remove permissive_or_unconfined()"	2015-02-23 17:34:38 +00:00
tools	resolved conflicts for merge of fc759204 to stage-aosp-master	2015-03-04 15:43:45 -08:00
.gitignore	Delete .swp file added by accident.	2014-07-22 17:42:35 -07:00
CleanSpec.mk	resolved conflicts for merge of 8f5fc9e2 to lmp-mr1-dev-plus-aosp	2015-01-22 18:53:59 +00:00
buildspec.mk.default	Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG	2013-07-25 15:52:17 -07:00
envsetup.sh	am 6492792d: Merge "Consult tput about color control sequence support"	2015-03-03 19:02:37 +00:00