Android Build Merger (Role) 5a2c0096d5 [automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc ... Change-Id: I50d425d04ba922293f6cb6a8003af8ca46dc03d4		2018-03-13 20:28:10 +00:00
core	[automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc	2018-03-13 20:28:10 +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