Android Build Merger (Role) affcc08a8e [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1 ... Change-Id: Ie690734a8144dc500ea8bbe297618e5368f48fbb		2018-02-12 19:15:32 +00:00
core	Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev am: c3aee02b03	2018-01-12 00:31:38 +00:00
libs/host	Clean up Mac OS hacks in acp slightly.	2016-01-05 09:32:42 -08:00
target	DO NOT MERGE ANYWHERE Allow /dev/goldfish_sync	2016-10-20 21:02:14 +00:00
tools	Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev	2018-01-12 22:14:30 +00:00
.gitignore	Add build subprojects to .gitignore	2015-07-23 13:18:47 -07:00
CleanSpec.mk	resolve merge conflicts of e4f7788661 to nyc-dr1-dev	2017-12-08 02:20:13 +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