Go to file
Colin Cross 651fc65988 Merge "Ignore Android.mk files with USE_SOONG=true" am: 19f6638026
am: 1ed08efbb9  -s ours

* commit '1ed08efbb95af6b8e4bca6b24ab9e10958cfebbd':
  Ignore Android.mk files with USE_SOONG=true
2016-01-13 23:42:36 +00:00
core Merge "Remove -Wa,noexecstack from unsupported arm clang flags" am: d29a84161e 2016-01-13 18:50:18 +00:00
libs/host Clean up Mac OS hacks in acp slightly. 2016-01-05 09:32:42 -08:00
target Merge "Remove special case handling of "ro." properties" am: 560fde999a 2016-01-13 18:50:00 +00:00
tools Merge "Unconditionally use SHA-256 when minSdkVersion is 18 or higher." am: fbee4f2e42 2016-01-13 18:50:24 +00:00
.gitignore Add build subprojects to .gitignore 2015-07-23 13:18:47 -07:00
CleanSpec.mk Change PLATFORM_VERSION from NYC to N 2015-11-11 10:35:31 -08:00
buildspec.mk.default Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG 2013-07-25 15:52:17 -07:00
envsetup.sh Revert "Make OpenJDK 8 the default" 2016-01-11 13:37:43 +00:00