Go to file
Trevor Johns 748ea8acb0 Merge "Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"" into nyc-dev
am: 18c202a

* commit '18c202a7d30591ba3b06f40231644fc86ae1ddc3':
  Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"

Change-Id: I4c8a10fa7d5093f5a0d3e23a185bc4209925146a
2016-04-12 18:48:07 +00:00
core Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS" am: 8a547f1 2016-04-12 03:06:52 +00:00
libs/host Remove LOCAL_ACP_UNAVAILABLE 2016-03-01 13:16:53 -08:00
target Merge "Add ext libs to core_tiny, they\'re needed for wear PDK" into nyc-dev 2016-04-12 01:49:27 +00:00
tools Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev" 2016-04-12 18:45:12 +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 Use ulimit -p rather than prlimit. 2016-03-07 14:05:22 -08:00