Go to file
Zach Jang 1f87a820ad resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 am: 3749025ccb am: e7bc1542db
am: 1be6c69524

Change-Id: If5d6ea4889550f45ef2a8f0ebf53a1e656c39010
2016-06-22 01:43:47 +00:00
core resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 am: 3749025ccb am: e7bc1542db 2016-06-22 01:43:47 +00:00
libs/host Clean up Mac OS hacks in acp slightly. 2016-01-05 09:32:42 -08:00
target Added make files for variable PRODUCT_SHIPPING_API_LEVEL. 2016-06-07 15:08:27 -07:00
tools Merge "squashfs: make disable-4k-align a parameter" into nyc-dev 2016-06-16 16:24:34 +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 build rule change for VTS (vendor test suite)'s metadata files 2016-04-25 13:06:57 -07:00