Commit Graph

36680 Commits

Author SHA1 Message Date
Steven Moreland f32645f1f4 Add soong variable for PRODUCT_FULL_TREBLE.
Required to preserve sane defaults for old codebases.

Test: inspect soong.variables
Test: ensure PRODUCT_SHIPPING_API_LEVEL is set in config.mk
Bug: 38415912
Merged-In: I0244fb02754663be3106391c9360fd1b2cc00d4a
Change-Id: I0244fb02754663be3106391c9360fd1b2cc00d4a
2017-05-19 15:54:18 -07:00
Adam Seaton b7abad0889 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b am: 9f80f090a8 -s ours am: 3f08725f86 -s ours am: 9f5ac04bf6 -s ours am: 43c5f2c0e6 -s ours
am: dacf55698c  -s ours

Change-Id: I825afe3a5ad95b1ab79a13c622cf760ed3ac66ae
2017-05-19 19:54:37 +00:00
Adam Seaton dacf55698c [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b am: 9f80f090a8 -s ours am: 3f08725f86 -s ours am: 9f5ac04bf6 -s ours
am: 43c5f2c0e6  -s ours

Change-Id: I700d0548236399f2a63fd95d09c5208a76f2e645
2017-05-19 19:53:07 +00:00
Adam Seaton c539c7656d [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b am: 9f80f090a8 am: 111b9d5599
am: e5875ba6ec  -s ours

Change-Id: I0a906fcbbea11112c9cfd495eb40a179725f4b33
2017-05-19 19:51:07 +00:00
Adam Seaton 43c5f2c0e6 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b am: 9f80f090a8 -s ours am: 3f08725f86 -s ours
am: 9f5ac04bf6  -s ours

Change-Id: I00587c43e6dce0d9fc7eee81936a5479eb067411
2017-05-19 19:51:07 +00:00
Adam Seaton e5875ba6ec [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b am: 9f80f090a8
am: 111b9d5599

Change-Id: I50989e2944625a0615942ed3d08d5e28dba10aec
2017-05-19 19:49:39 +00:00
Adam Seaton 9f5ac04bf6 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b am: 9f80f090a8 -s ours
am: 3f08725f86  -s ours

Change-Id: I5b2260c4adc4169609293ff6a33198dc80c05a72
2017-05-19 19:49:37 +00:00
Adam Seaton 111b9d5599 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b
am: 9f80f090a8

Change-Id: I30a94cf4626db5604c5617c1db5b80e1d8a55afb
2017-05-19 19:47:38 +00:00
Adam Seaton 3f08725f86 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b
am: 9f80f090a8  -s ours

Change-Id: Ic375882bc160265728515b8553041f7031744738
2017-05-19 19:47:36 +00:00
Adam Seaton 9f80f090a8 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours am: fc30cdc480
am: 04b0eb600b

Change-Id: Ib890f67a07c1ee998420e0d2a73bdaa02aa1828f
2017-05-19 19:45:39 +00:00
Adam Seaton ca020917a2 Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409 -s ours am: 6a94730d20 am: 70accb9b43 am: 974d64ee8f -s ours am: 588a0f8523 -s ours am: 5311ff5db5 -s ours am: 674c03c38f -s ours
am: 521f5df845  -s ours

Change-Id: I50a39772b875360380fc2c4121c152cddefdfd7c
2017-05-19 19:44:32 +00:00
Adam Seaton 04b0eb600b [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a am: 5482ef4491 -s ours
am: fc30cdc480

Change-Id: Ib999be3acd32afc13859e7fb49352cf23452dc91
2017-05-19 19:44:08 +00:00
Adam Seaton 49f4c0055e Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours am: 288fd15d69 am: 701dc24fb9 am: 75864440c3 -s ours am: 0ac3704512 -s ours am: 0c1c0aa4b5 -s ours am: e19a6c202f -s ours
am: 13f423f0e1  -s ours

Change-Id: I069bf6c0cf16514f398e1c1792df3430791381dd
2017-05-19 19:44:06 +00:00
Adam Seaton fc30cdc480 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3 am: 90028cf69a
am: 5482ef4491  -s ours

Change-Id: I26bebc5e9dd4a3e04af3767970c323a310f1b16f
2017-05-19 19:42:06 +00:00
Adam Seaton 4319c6dda3 Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409 -s ours am: 6a94730d20 am: 70accb9b43 am: 974d64ee8f am: 8b0ad111c3
am: dc36b5a2a9  -s ours

Change-Id: Ic275d09a93373969a74ad795a0e5b4ea593b2fbf
2017-05-19 19:40:58 +00:00
Adam Seaton 521f5df845 Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409 -s ours am: 6a94730d20 am: 70accb9b43 am: 974d64ee8f -s ours am: 588a0f8523 -s ours am: 5311ff5db5 -s ours
am: 674c03c38f  -s ours

Change-Id: Ia7e92b85c45eeeed918c92ebfeef0333e0e37738
2017-05-19 19:40:57 +00:00
Adam Seaton 5482ef4491 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91 am: 5868fb70b3
am: 90028cf69a

Change-Id: I8804295956083b6f6a8bf01b08ec8085b3e068d4
2017-05-19 19:40:37 +00:00
Adam Seaton f283419a6c Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours am: 288fd15d69 am: 701dc24fb9 am: 75864440c3 am: 0987d99c90
am: 0edfdf927d  -s ours

Change-Id: I042d8d8d1ea534a122924a96cf9c0867e82dc002
2017-05-19 19:40:37 +00:00
Adam Seaton 13f423f0e1 Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours am: 288fd15d69 am: 701dc24fb9 am: 75864440c3 -s ours am: 0ac3704512 -s ours am: 0c1c0aa4b5 -s ours
am: e19a6c202f  -s ours

Change-Id: I9d612bc932fa4d9bc8401baa2fbf39ccf3232215
2017-05-19 19:40:36 +00:00
Adam Seaton dc36b5a2a9 Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409 -s ours am: 6a94730d20 am: 70accb9b43 am: 974d64ee8f
am: 8b0ad111c3

Change-Id: I42c3783e2e4c7664d06284d9e8a66051fa9b2cd1
2017-05-19 19:39:04 +00:00
Adam Seaton 674c03c38f Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409 -s ours am: 6a94730d20 am: 70accb9b43 am: 974d64ee8f -s ours am: 588a0f8523 -s ours
am: 5311ff5db5  -s ours

Change-Id: I743e41d1c663079b9b2d241515576c5267b75832
2017-05-19 19:38:58 +00:00
Adam Seaton 0edfdf927d Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours am: 288fd15d69 am: 701dc24fb9 am: 75864440c3
am: 0987d99c90

Change-Id: I9fbfc1179d1bbf612248c0fb8d2aa73d1ab7614a
2017-05-19 19:38:37 +00:00
Adam Seaton 90028cf69a [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours am: 025c26de91
am: 5868fb70b3

Change-Id: I14f5bcd5373daa4b17d82f71bb873fef2b80ff12
2017-05-19 19:38:36 +00:00
Adam Seaton e19a6c202f Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours am: 288fd15d69 am: 701dc24fb9 am: 75864440c3 -s ours am: 0ac3704512 -s ours
am: 0c1c0aa4b5  -s ours

Change-Id: I12653416d280df8ab8da8e1684d9113d6c0c51bb
2017-05-19 19:38:36 +00:00
Adam Seaton 5311ff5db5 Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409 -s ours am: 6a94730d20 am: 70accb9b43 am: 974d64ee8f -s ours
am: 588a0f8523  -s ours

Change-Id: I28d0bb37c2c119dfed044acc09d1660f6c6260a7
2017-05-19 19:37:00 +00:00
Adam Seaton 5868fb70b3 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6 am: b3219be744 -s ours
am: 025c26de91

Change-Id: Iedb9b5e111975a9372d35f790464ff553d3c11d9
2017-05-19 19:36:37 +00:00
Adam Seaton 0c1c0aa4b5 Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours am: 288fd15d69 am: 701dc24fb9 am: 75864440c3 -s ours
am: 0ac3704512  -s ours

Change-Id: I43614144b696f86fdfaca8ac4cd2d20d2f52d5de
2017-05-19 19:36:35 +00:00
Adam Seaton 8b0ad111c3 Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409 -s ours am: 6a94730d20 am: 70accb9b43
am: 974d64ee8f

Change-Id: If0b073a2967ab39d8ab15720e0945191c81e1078
2017-05-19 19:35:27 +00:00
Adam Seaton 588a0f8523 Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409 -s ours am: 6a94730d20 am: 70accb9b43
am: 974d64ee8f  -s ours

Change-Id: I448dd5be384ecd58e8a3ceb05d1c9c1a5713b53f
2017-05-19 19:35:26 +00:00
Adam Seaton 0987d99c90 Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours am: 288fd15d69 am: 701dc24fb9
am: 75864440c3

Change-Id: I5b91655a0ad5f545a7f48932a7d48703a9c46322
2017-05-19 19:35:07 +00:00
Adam Seaton 025c26de91 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours am: 05965e37e6
am: b3219be744  -s ours

Change-Id: Ifb51131e21dfb7fddc95d3514b494950e608af51
2017-05-19 19:35:05 +00:00
Adam Seaton 0ac3704512 Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours am: 288fd15d69 am: 701dc24fb9
am: 75864440c3  -s ours

Change-Id: I358507c9526f70125bf28b5af87f9bfaa9e867fa
2017-05-19 19:35:05 +00:00
Adam Seaton 974d64ee8f Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409 -s ours am: 6a94730d20
am: 70accb9b43

Change-Id: I62e008a1e018893cb5ddf7201d92343f67942912
2017-05-19 19:33:25 +00:00
Adam Seaton 75864440c3 Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours am: 288fd15d69
am: 701dc24fb9

Change-Id: I6e6185d1640ff6fd18122763e94fc637453ccaad
2017-05-19 19:33:06 +00:00
Adam Seaton b3219be744 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours am: bf2d4968da -s ours
am: 05965e37e6

Change-Id: Ic1311cbf4fe550f7789f62588828299f8248518a
2017-05-19 19:33:05 +00:00
Adam Seaton 70accb9b43 Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409 -s ours
am: 6a94730d20

Change-Id: I505e20e71ccc2fc4f594300b3b94c45fb1e5c8a2
2017-05-19 19:31:29 +00:00
Adam Seaton 701dc24fb9 Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours
am: 288fd15d69

Change-Id: I5dc3408114f58145810c33111b15d4d40e7a3835
2017-05-19 19:31:06 +00:00
Adam Seaton 05965e37e6 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781 -s ours
am: bf2d4968da  -s ours

Change-Id: I5cd9534838910791e689a6659480d1862785ef10
2017-05-19 19:31:04 +00:00
Adam Seaton 6a94730d20 Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d
am: e10ce80409  -s ours

Change-Id: I62e3792b2aef5064d04d488c5ca631d0a0631e58
2017-05-19 19:29:29 +00:00
Adam Seaton 288fd15d69 Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8
am: 3f5593376d  -s ours

Change-Id: I7b94b0638f33d133ea45d69986ac853b613d4f44
2017-05-19 19:29:04 +00:00
Adam Seaton bf2d4968da [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2
am: ad8ec7f781  -s ours

Change-Id: I8b558f6db1b76d4169e10f78be020e8e605c0968
2017-05-19 19:29:04 +00:00
Adam Seaton e10ce80409 Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd am: 5c7bac6231
am: 1899a63f1d

Change-Id: Ib018b81b77ca749333a4700049a525523e2f83c1
2017-05-19 19:27:37 +00:00
Adam Seaton 3f5593376d Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0
am: 535ade48f8

Change-Id: I3c084d863cb3b091c0e7ebf7783969c9c7125fa1
2017-05-19 19:27:05 +00:00
Adam Seaton 2af63a8402 [DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec am: b31b3f6019 am: 652d99234a -s ours am: 387e0bb99a -s ours am: a871e8ff81 am: d872742f52 -s ours am: 2e17d83fcd am: 18e5f9b4f6 am: 7d58605e6b am: ad860c3d0d -s ours am: ee22290a47 am: 7b94aecada am: 7fe1da4f84 -s ours am: ff461ef52c -s ours am: 5412c380f4 -s ours am: 1ffe37a8d3 -s ours
am: 7155b13e7c  -s ours

Change-Id: I7ecbbded883175486e22ec089abe368105066ea5
2017-05-19 19:27:04 +00:00
Adam Seaton ad8ec7f781 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d
am: 54f2af92b2

Change-Id: I18f6472f3d3bdc7af56c95b200213ad804c38039
2017-05-19 19:27:04 +00:00
Adam Seaton 1899a63f1d Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df -s ours am: 4cfcc9fe73 am: 8a893de625 -s ours am: 9f169ddbcd
am: 5c7bac6231

Change-Id: Idc1d79faa12fdd938f57e1678fbb34bbbc9c6bcd
2017-05-19 19:26:00 +00:00
Adam Seaton 535ade48f8 Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c
am: 16dcd532a0

Change-Id: Ic6b017fd04b00a2cf65336e76386d94cabc8b13a
2017-05-19 19:25:36 +00:00
Adam Seaton 7155b13e7c [DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec am: b31b3f6019 am: 652d99234a -s ours am: 387e0bb99a -s ours am: a871e8ff81 am: d872742f52 -s ours am: 2e17d83fcd am: 18e5f9b4f6 am: 7d58605e6b am: ad860c3d0d -s ours am: ee22290a47 am: 7b94aecada am: 7fe1da4f84 -s ours am: ff461ef52c -s ours am: 5412c380f4 -s ours
am: 1ffe37a8d3  -s ours

Change-Id: Id04a866435207c4a4c2d84ab132df034a7fcf112
2017-05-19 19:25:35 +00:00
Adam Seaton 54f2af92b2 [DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695
am: e2d22d501d

Change-Id: Ic8419e3d3b12a90173888aff21a11b18f2ed2bbb
2017-05-19 19:25:35 +00:00
Adam Seaton 1ffe37a8d3 [DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec am: b31b3f6019 am: 652d99234a -s ours am: 387e0bb99a -s ours am: a871e8ff81 am: d872742f52 -s ours am: 2e17d83fcd am: 18e5f9b4f6 am: 7d58605e6b am: ad860c3d0d -s ours am: ee22290a47 am: 7b94aecada am: 7fe1da4f84 -s ours am: ff461ef52c -s ours
am: 5412c380f4  -s ours

Change-Id: Icb7123ea33c0a0d24b9b0e1152ce3a4b007c4e9b
2017-05-19 19:22:34 +00:00