Keun Soo Yim 9c2ef6454b resolve merge conflicts of 75a72a1 to nyc-mr1-dev-plus-aosp ... Change-Id: I82cb7c681bf0b34b70c981808a55b431a3b954fb		2016-04-25 15:49:44 -07:00
core	resolve merge conflicts of 75a72a1 to nyc-mr1-dev-plus-aosp	2016-04-25 15:49:44 -07:00
libs/host	Remove LOCAL_ACP_UNAVAILABLE	2016-03-01 13:16:53 -08:00
target	Merge "Add fake libart" into nyc-dev am: 1c04ad1	2016-04-25 22:14:37 +00:00
tools	target_files_diff: Fix the issue with file type change.	2016-04-25 18:35:20 +00:00
.gitignore	Add build subprojects to .gitignore	2015-07-23 13:18:47 -07:00
CleanSpec.mk	Merge "CleanSpec: Clean up /recovery/root/sdcard." am: b69d3b28a5	2016-01-22 18:53:15 +00:00
buildspec.mk.default	Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG	2013-07-25 15:52:17 -07:00
envsetup.sh	resolve merge conflicts of 75a72a1 to nyc-mr1-dev-plus-aosp	2016-04-25 15:49:44 -07:00