Commit Graph

42512 Commits

Author SHA1 Message Date
Sen Jiang fec0745c29 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843 am: 64e3da49be am: ed62f299b5 am: ea43cfbea1 -s ours am: ca09e189e9 -s ours am: 96df5e3ef8 -s ours am: 51e5c7687c -s ours
am: 9c9f2ad8cb  -s ours

Change-Id: I3bf4d80f1bcc9e3dc14ae5515d7e31bf2ac073aa
2018-01-12 22:58:01 +00:00
Sen Jiang 9c9f2ad8cb Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843 am: 64e3da49be am: ed62f299b5 am: ea43cfbea1 -s ours am: ca09e189e9 -s ours am: 96df5e3ef8 -s ours
am: 51e5c7687c  -s ours

Change-Id: I4df9170b53ff2cb34a2f46cd0b422e3f3fda5824
2018-01-12 22:51:54 +00:00
Sen Jiang 51e5c7687c Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843 am: 64e3da49be am: ed62f299b5 am: ea43cfbea1 -s ours am: ca09e189e9 -s ours
am: 96df5e3ef8  -s ours

Change-Id: I26899877793a29934ab21a8297e22da2e6a23b01
2018-01-12 22:44:25 +00:00
Sen Jiang 96df5e3ef8 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843 am: 64e3da49be am: ed62f299b5 am: ea43cfbea1 -s ours
am: ca09e189e9  -s ours

Change-Id: I1db61e09a632d8587868ec6d28886965cd90dd35
2018-01-12 22:37:56 +00:00
Sen Jiang ca09e189e9 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843 am: 64e3da49be am: ed62f299b5
am: ea43cfbea1  -s ours

Change-Id: Iab2f6f021ff2269475898c6bb362fb67518bf59d
2018-01-12 22:30:20 +00:00
Sen Jiang ea43cfbea1 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843 am: 64e3da49be
am: ed62f299b5

Change-Id: I88c06fb665f834a006b381bc0a2eb02e6303a690
2018-01-12 22:23:21 +00:00
Sen Jiang ed62f299b5 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev am: 21a26c9843
am: 64e3da49be

Change-Id: Ic2e9ff1ec09f81a6fc960663c4e3bca397d7784e
2018-01-12 22:19:08 +00:00
Sen Jiang 64e3da49be Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev
am: 21a26c9843

Change-Id: I656c817338e6b1921213478cdb4f98923561487e
2018-01-12 22:14:30 +00:00
Sen Jiang 21a26c9843 Merge "Specify --max_timestamp when calling brillo_update_payload." into nyc-dr1-dev 2018-01-12 22:03:43 +00:00
Sen Jiang 18a6db4ef8 Merge "Specify --max_timestamp when calling brillo_update_payload." into oc-dev am: 4378910f30 am: d35542316d am: 9d11ec7bdc -s ours
am: b30ba8ca58  -s ours

Change-Id: I97fbd298427fbe41bde38edf838489b305dfb0ba
2018-01-12 21:21:44 +00:00
Sen Jiang b30ba8ca58 Merge "Specify --max_timestamp when calling brillo_update_payload." into oc-dev am: 4378910f30 am: d35542316d
am: 9d11ec7bdc  -s ours

Change-Id: I4579bd3a0e40da263f8e14adf60c77173e8e6ab5
2018-01-12 21:17:19 +00:00
Sen Jiang 9d11ec7bdc Merge "Specify --max_timestamp when calling brillo_update_payload." into oc-dev am: 4378910f30
am: d35542316d

Change-Id: I3a0096432cad3dad8fd283ace19fc21d64d9c42e
2018-01-12 21:11:30 +00:00
Sen Jiang d35542316d Merge "Specify --max_timestamp when calling brillo_update_payload." into oc-dev
am: 4378910f30

Change-Id: I9fad200f94443f906cf7d53317db449543b5b6c6
2018-01-12 21:06:23 +00:00
Sen Jiang 4378910f30 Merge "Specify --max_timestamp when calling brillo_update_payload." into oc-dev 2018-01-12 20:55:22 +00:00
Elisa Pascual Trevino 0c874a0836 [DO NOT MERGE] Update security string to 2018-03-05 for oc-dev Bug:71860241 am: 44861dc6dd am: d57400b494 am: eaba92c92c
am: e8aa8ed91f  -s ours

Change-Id: I10852abf6d15b22523637165edfa5f86d9169b0e
2018-01-12 20:47:34 +00:00
Elisa Pascual Trevino e8aa8ed91f [DO NOT MERGE] Update security string to 2018-03-05 for oc-dev Bug:71860241 am: 44861dc6dd am: d57400b494
am: eaba92c92c

Change-Id: I599dba59b95f4684df8ce15fbff375a1f5771dca
2018-01-12 20:36:38 +00:00
Elisa Pascual Trevino eaba92c92c [DO NOT MERGE] Update security string to 2018-03-05 for oc-dev Bug:71860241 am: 44861dc6dd
am: d57400b494

Change-Id: If650f336cf65ecc97eca7a2095dd77052dfd8fc2
2018-01-12 20:31:04 +00:00
Elisa Pascual Trevino d57400b494 [DO NOT MERGE] Update security string to 2018-03-05 for oc-dev Bug:71860241
am: 44861dc6dd

Change-Id: If466dfd2c187d532256400c542a2365255db8e3f
2018-01-12 20:25:27 +00:00
Stephen Hines 4dac41f915 Merge "Remove unnecessary USE_CLANG_PLATFORM_BUILD." am: 504bd79e86 am: dfc0111700
am: c8efc4d5f8

Change-Id: I6f06b63f3d582abe98f02361d6a3c7918c240eb7
2018-01-12 18:49:26 +00:00
Stephen Hines c8efc4d5f8 Merge "Remove unnecessary USE_CLANG_PLATFORM_BUILD." am: 504bd79e86
am: dfc0111700

Change-Id: I1788117c1661002794f853f06c7d5cfd253f5389
2018-01-12 18:39:38 +00:00
Stephen Hines dfc0111700 Merge "Remove unnecessary USE_CLANG_PLATFORM_BUILD."
am: 504bd79e86

Change-Id: I063e6632b256eb8361cc63251398d30d63a08c58
2018-01-12 18:27:21 +00:00
Stephen Hines 504bd79e86 Merge "Remove unnecessary USE_CLANG_PLATFORM_BUILD." 2018-01-12 18:19:45 +00:00
Elisa Pascual Trevino 44861dc6dd [DO NOT MERGE] Update security string to 2018-03-05 for oc-dev
Bug:71860241
2018-01-12 17:38:16 +00:00
Elisa Pascual Trevino d77bb9f26f Merge "[DO NOT MERGE] Update security string to 2018-03-01 for oc-dev Bug:71860241" into oc-dev am: 48539e0ff6 am: 560b80b913 am: b02a234540
am: 650dcd0d5c  -s ours

Change-Id: I9f42d6fc2da1cf8b18faf172bd3cb812e2d67c5a
2018-01-12 02:09:33 +00:00
Elisa Pascual Trevino 650dcd0d5c Merge "[DO NOT MERGE] Update security string to 2018-03-01 for oc-dev Bug:71860241" into oc-dev am: 48539e0ff6 am: 560b80b913
am: b02a234540

Change-Id: If18833bc3c3ca86530c713fbea32f1834566a9ac
2018-01-12 01:55:22 +00:00
Elisa Pascual Trevino b02a234540 Merge "[DO NOT MERGE] Update security string to 2018-03-01 for oc-dev Bug:71860241" into oc-dev am: 48539e0ff6
am: 560b80b913

Change-Id: I3e98e6c0e4c054460a9972cb2caf1149e0713282
2018-01-12 01:49:46 +00:00
Elisa Pascual Trevino 560b80b913 Merge "[DO NOT MERGE] Update security string to 2018-03-01 for oc-dev Bug:71860241" into oc-dev
am: 48539e0ff6

Change-Id: I4ee78230426155da8d620bfed6df81b5073e9de5
2018-01-12 01:44:15 +00:00
TreeHugger Robot 48539e0ff6 Merge "[DO NOT MERGE] Update security string to 2018-03-01 for oc-dev Bug:71860241" into oc-dev 2018-01-12 01:33:33 +00:00
Elisa Pascual Trevino 83486e0b48 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 am: 5a53ba3eb3 am: 82b90c8110 -s ours am: b75e95f40a am: 8d7856b98a am: ab834f7d14
am: cc4c5a7e21  -s ours

Change-Id: Ifcb55b397e431c03920144f1af17a97e9af087f0
2018-01-12 01:31:26 +00:00
Elisa Pascual Trevino cc4c5a7e21 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 am: 5a53ba3eb3 am: 82b90c8110 -s ours am: b75e95f40a am: 8d7856b98a
am: ab834f7d14

Change-Id: I85dddc52cc7bced675fbe21728561e3622ea5dcc
2018-01-12 01:25:34 +00:00
Elisa Pascual Trevino ab834f7d14 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 am: 5a53ba3eb3 am: 82b90c8110 -s ours am: b75e95f40a
am: 8d7856b98a

Change-Id: I3bca6fa5a6da794c9ab670e5d037222c7352a8f5
2018-01-12 01:16:14 +00:00
Elisa Pascual Trevino 8d7856b98a 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 am: 5a53ba3eb3 am: 82b90c8110 -s ours
am: b75e95f40a

Change-Id: I05ea8573430cc94e3c83fdc1eec91971aac9c2dc
2018-01-12 01:01:50 +00:00
Elisa Pascual Trevino b75e95f40a 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 am: 5a53ba3eb3
am: 82b90c8110  -s ours

Change-Id: I3090e3011e91d75c1f0d99762037b06e9f82e34a
2018-01-12 00:52:46 +00:00
Elisa Pascual Trevino 82b90c8110 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
am: 5a53ba3eb3

Change-Id: I86650749707258d7b440a09f284fc5fcc8e05c32
2018-01-12 00:47:02 +00:00
Elisa Pascual Trevino 5a53ba3eb3 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

Change-Id: I620835e63f499c8e1b8260b5b1414f84d3286eba
2018-01-12 00:40:01 +00:00
Elisa Pascual Trevino 97c5983559 [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df am: a615903311 am: 81e61008ed am: 51e7d3a175 -s ours am: cd6054fa86 am: 6619c472f3 am: a1c02ac99e am: 2daf3f586c am: ba60cad7ab -s ours am: 587ec653f1 am: fdac6439e4 am: 74ba94d143
am: 70b54f04dc  -s ours

Change-Id: I022a18060535b121dd95cfd0918cabd257e582f8
2018-01-12 00:31:59 +00:00
Elisa Pascual Trevino f113fe294c Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev am: c3aee02b03
am: 4ab30bc502

Change-Id: I5c38e422102517f52e0aacfabbf63918cd9de7a5
2018-01-12 00:31:38 +00:00
Elisa Pascual Trevino 4ab30bc502 Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev
am: c3aee02b03

Change-Id: I2db4d77ae94e11c304cbbe74557e5c6f42c8a6cd
2018-01-12 00:26:24 +00:00
Elisa Pascual Trevino 70b54f04dc [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df am: a615903311 am: 81e61008ed am: 51e7d3a175 -s ours am: cd6054fa86 am: 6619c472f3 am: a1c02ac99e am: 2daf3f586c am: ba60cad7ab -s ours am: 587ec653f1 am: fdac6439e4
am: 74ba94d143

Change-Id: Ic0c409b86b5bb5d304d8fa8946dde17575f5094e
2018-01-12 00:22:59 +00:00
Dan Albert f49f74cb20 Merge "Disable availability macros in libc++ on Darwin." am: ba4641931b am: 38435d2f70
am: c615ff3f02

Change-Id: I0e15b7b31f8a70c1eaac4ded60bff7d013498884
2018-01-12 00:22:51 +00:00
TreeHugger Robot c3aee02b03 Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev 2018-01-12 00:19:37 +00:00
Elisa Pascual Trevino 74ba94d143 [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df am: a615903311 am: 81e61008ed am: 51e7d3a175 -s ours am: cd6054fa86 am: 6619c472f3 am: a1c02ac99e am: 2daf3f586c am: ba60cad7ab -s ours am: 587ec653f1
am: fdac6439e4

Change-Id: I8af9ec19010e43bb1e8359af152543332f1499f8
2018-01-12 00:17:57 +00:00
Elisa Pascual Trevino fdac6439e4 [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df am: a615903311 am: 81e61008ed am: 51e7d3a175 -s ours am: cd6054fa86 am: 6619c472f3 am: a1c02ac99e am: 2daf3f586c am: ba60cad7ab -s ours
am: 587ec653f1

Change-Id: I9574d7d801ff7804003ba8fe382078abcc8e11ba
2018-01-12 00:14:06 +00:00
Elisa Pascual Trevino 587ec653f1 [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df am: a615903311 am: 81e61008ed am: 51e7d3a175 -s ours am: cd6054fa86 am: 6619c472f3 am: a1c02ac99e am: 2daf3f586c
am: ba60cad7ab  -s ours

Change-Id: I8c98113547529e4db2146eaa682e829ee0ac9fd2
2018-01-12 00:11:34 +00:00
Elisa Pascual Trevino ba60cad7ab [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df am: a615903311 am: 81e61008ed am: 51e7d3a175 -s ours am: cd6054fa86 am: 6619c472f3 am: a1c02ac99e
am: 2daf3f586c

Change-Id: I35d9356b70e92b50385a879e54576a244574dd1d
2018-01-12 00:09:57 +00:00
Dan Albert c615ff3f02 Merge "Disable availability macros in libc++ on Darwin." am: ba4641931b
am: 38435d2f70

Change-Id: I08b0f641e7a416a162abec6fed7df1cb7d7c228a
2018-01-12 00:07:17 +00:00
Elisa Pascual Trevino 2daf3f586c [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df am: a615903311 am: 81e61008ed am: 51e7d3a175 -s ours am: cd6054fa86 am: 6619c472f3
am: a1c02ac99e

Change-Id: Ic6f9e8e25a106a49986683e8f23f641d0cc749f5
2018-01-12 00:07:13 +00:00
Elisa Pascual Trevino a1c02ac99e [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df am: a615903311 am: 81e61008ed am: 51e7d3a175 -s ours am: cd6054fa86
am: 6619c472f3

Change-Id: I23f4290b7f7cdbc30ea9b36530421b9a14a50d26
2018-01-12 00:03:48 +00:00
Dan Albert 38435d2f70 Merge "Disable availability macros in libc++ on Darwin."
am: ba4641931b

Change-Id: Ie4f17a56b87254e96f938b3f0d6d7c02f20704aa
2018-01-12 00:03:02 +00:00
Elisa Pascual Trevino 6619c472f3 [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df am: a615903311 am: 81e61008ed am: 51e7d3a175 -s ours
am: cd6054fa86

Change-Id: I2bfc125bbc7cf0f23c90b82d4b739d66b8de24b8
2018-01-11 23:57:20 +00:00