No description

Colin Cross a2cfb78f79 resolve conflicts for merge of 89675456 into mnc-dr-dev-plus-aosp ... Change-Id: Ia99e16eb83902f008960007468dd4d9fba88319a		2015-07-21 10:56:26 -07:00
core	resolve conflicts for merge of 89675456 into mnc-dr-dev-plus-aosp	2015-07-21 10:56:26 -07:00
libs/host	Stop disallowing sanitizers.	2015-06-16 22:20:19 -07:00
target	am 4a5f5a7b: am a972891f: Merge "file_contexts: Label /dev/ttyS2 as console_device"	2015-07-16 19:19:56 +00:00
tools	am 0d4a9405: am ecb7b37b: Merge "Assert the stash size when generating OTAs."	2015-07-14 20:53:40 +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	Raise API level to 23.	2015-06-26 15:54:10 -07:00
envsetup.sh	am abbf8eeb: am a521a37d: Merge "mgrep: add output to environment commands"	2015-07-15 20:17:51 +00:00