Android Build Merger (Role) 49f77737a2 [automerger] [DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev Bug:73240847 am: e4d86d9b06 am: 83709d3152 am: 70ea788dfa skipped: ac14372129 am: 83c448128c am: 50abbfdb53 am: 00a67ddab1 am: 2afc690751 ... Change-Id: I41804bc2f8485c6b89708a3a7e82cb8f49fd37be		2018-02-12 19:29:27 +00:00
core	Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev am: c3aee02b03 am: 4ab30bc502 am: f113fe294c	2018-01-12 00:47:02 +00:00
libs/host	Clean up Mac OS hacks in acp slightly.	2016-01-05 09:32:42 -08:00
target	Copy IDC for goldfish_rotary to /system/usr/idc	2017-01-18 11:02:02 +00:00
tools	Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843 am: 64e3da49be	2018-01-12 22:23:21 +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