OSDN Git Service

android-x86/build.git
7 years ago[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am...
Adam Seaton [Wed, 12 Apr 2017 22:42:15 +0000 (22:42 +0000)]
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8  -s ours am: 4389a11f4b  -s ours am: 65101a958e am: 18c3da68f0  -s ours am: 988fc368d3 am: 14ef6098bb am: a34845a20c
am: a73f9cf1f5  -s ours

Change-Id: I2863a1477faf4c78b9e8f76dde98d2a1bba876c3

7 years ago[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am...
Adam Seaton [Wed, 12 Apr 2017 22:36:43 +0000 (22:36 +0000)]
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8  -s ours am: 4389a11f4b  -s ours am: 65101a958e am: 18c3da68f0  -s ours am: 988fc368d3 am: 14ef6098bb
am: a34845a20c

Change-Id: I597322f70ca78e3632a59b6c0722b0fe3130a015

7 years ago[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am...
Adam Seaton [Wed, 12 Apr 2017 22:31:13 +0000 (22:31 +0000)]
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8  -s ours am: 4389a11f4b  -s ours am: 65101a958e am: 18c3da68f0  -s ours am: 988fc368d3
am: 14ef6098bb

Change-Id: If78940c3c89e6bac35eb051bfa7908e03d18ee1a

7 years ago[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am...
Adam Seaton [Wed, 12 Apr 2017 22:26:42 +0000 (22:26 +0000)]
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8  -s ours am: 4389a11f4b  -s ours am: 65101a958e am: 18c3da68f0  -s ours
am: 988fc368d3

Change-Id: Ice678f7c46970fe343208e5b793bbd362439192e

7 years ago[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am...
Adam Seaton [Wed, 12 Apr 2017 22:21:12 +0000 (22:21 +0000)]
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8  -s ours am: 4389a11f4b  -s ours am: 65101a958e
am: 18c3da68f0  -s ours

Change-Id: I5d27b65e5817456cab95468c7531f3621e95cb7d

7 years ago[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am...
Adam Seaton [Wed, 12 Apr 2017 22:16:42 +0000 (22:16 +0000)]
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8  -s ours am: 4389a11f4b  -s ours
am: 65101a958e

Change-Id: I523c87b067d7693b121242a73be982b4094e62bf

7 years ago[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am...
Adam Seaton [Wed, 12 Apr 2017 22:11:42 +0000 (22:11 +0000)]
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8  -s ours
am: 4389a11f4b  -s ours

Change-Id: I7470bfd4621f2281ee2bf03c8dd0fb0e80bba5e6

7 years ago[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am...
Adam Seaton [Wed, 12 Apr 2017 22:05:41 +0000 (22:05 +0000)]
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07
am: 386d7ae2e8  -s ours

Change-Id: I272f3827ce226d1bde50e7391e288436277297c2

7 years ago[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
Adam Seaton [Wed, 12 Apr 2017 22:00:09 +0000 (22:00 +0000)]
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
am: 8dcfa2ac07

Change-Id: I3e236b94d24700299389ae02501ef8a232dad598

7 years ago[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev
Adam Seaton [Wed, 12 Apr 2017 21:55:10 +0000 (21:55 +0000)]
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev
am: e6a77de43b

Change-Id: I695b346d4769e30995ea91f0e864fd95afe4866a

7 years ago[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev
Adam Seaton [Tue, 11 Apr 2017 18:04:34 +0000 (11:04 -0700)]
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev

bug:37204197
Change-Id: I9790487cd9bf8fb8e44856216407b35d067a9d16

7 years ago[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev
Adam Seaton [Tue, 11 Apr 2017 18:03:48 +0000 (11:03 -0700)]
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev

bug:37204197
Change-Id: I81ae6196028c983baf82800a364805025672bec9

7 years ago[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev
Adam Seaton [Mon, 10 Apr 2017 16:36:42 +0000 (09:36 -0700)]
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev

Bug:37204197
Change-Id: I7b0b5428c9b1f7ea7ab3a3e272689e6324dde8af

7 years agoreleasetools: Add support for --override_timestamp.
Tao Bao [Tue, 28 Feb 2017 19:48:48 +0000 (11:48 -0800)]
releasetools: Add support for --override_timestamp.

We use the timestamps in builds to determine a downgrade, which might
not be always the truth. For examples, two builds cut from different
branches may carry timestamps in a reverse order. An incremental package
won't be able to be pushed nor applied, based on the timestamp
comparison.

We used to handle such a case with manual work, by setting the
post-timestamp to (pre-timestamp + 1) in the package metadata. This CL
automates the process by adding a new flag --override_timestamp.

Note that it doesn't change anything in the installed image, but only
affects the assertions for pushing / installing the package.

With the change in this CL:
 - If it's a downgrade without any extra flag, fail the package
   generation (we only print warnings prior to this CL);
 - If it's a downgrade with --downgrade flag, generate a downgrade
   package with forced data wipe (same as before);
 - If it's a downgrade with --override_timestamp, generate a normal
   incremental with hacked timestamp (pre-timestamp + 1) (new in this CL
   to avoid the manual change);
 - If it's not a downgrade but with any of the above two flags specified,
   fail the package generation.

Bug: 33744169
Test: Generate an incremental from builds with reversed timestamps.
Change-Id: I8b187d32708b4a7c3e20f8c6adb8f9527b73b965
Merged-In: I8b187d32708b4a7c3e20f8c6adb8f9527b73b965
(cherry picked from commit 3e6161a3b33da5a46c80c79e2d815168923e83c3)

7 years agoMerge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev
Tao Bao [Thu, 16 Mar 2017 18:19:39 +0000 (18:19 +0000)]
Merge "releasetools: Support generating downgrade A/B OTAs." into nyc-dev

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am...
Adam Seaton [Thu, 16 Mar 2017 16:58:21 +0000 (16:58 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492  -s ours am: 1b9f1e8156  -s ours am: b3b5777fff am: bff6f7d991  -s ours am: b65c93dbcf am: 3ded290e7d am: 2996209f6f
am: b6279913b3  -s ours

Change-Id: Iee68c8539156a9a1212269b7559bf2bbc2dbf679

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am...
Adam Seaton [Thu, 16 Mar 2017 16:58:15 +0000 (16:58 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302  -s ours am: 5e0c5f0263  -s ours am: 8edd5d7e30 am: 5af5f2c46f  -s ours am: e1d7ca1ec7 am: 35c6a6d4a3 am: 099df1bb0d
am: c1d127aa41  -s ours

Change-Id: Ie815da36673001b4583d0efff84b15adde39f542

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am...
Adam Seaton [Thu, 16 Mar 2017 16:55:22 +0000 (16:55 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492  -s ours am: 1b9f1e8156  -s ours am: b3b5777fff am: bff6f7d991  -s ours am: b65c93dbcf am: 3ded290e7d
am: 2996209f6f

Change-Id: I21b30e7b6d572d4a1e86cb9ae68b33bafc8a19cb

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am...
Adam Seaton [Thu, 16 Mar 2017 16:55:16 +0000 (16:55 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302  -s ours am: 5e0c5f0263  -s ours am: 8edd5d7e30 am: 5af5f2c46f  -s ours am: e1d7ca1ec7 am: 35c6a6d4a3
am: 099df1bb0d

Change-Id: I459ef0225cc32954e417fabc8006a65ae64f90ca

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am...
Adam Seaton [Thu, 16 Mar 2017 16:52:54 +0000 (16:52 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492  -s ours am: 1b9f1e8156  -s ours am: b3b5777fff am: bff6f7d991  -s ours am: b65c93dbcf
am: 3ded290e7d

Change-Id: I1646614f2fcb0990c03f168aaa9b0768f1f5eae2

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am...
Adam Seaton [Thu, 16 Mar 2017 16:52:46 +0000 (16:52 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302  -s ours am: 5e0c5f0263  -s ours am: 8edd5d7e30 am: 5af5f2c46f  -s ours am: e1d7ca1ec7
am: 35c6a6d4a3

Change-Id: Idcb0514e5e5dca5f09c222632ee23112d20560dc

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am...
Adam Seaton [Thu, 16 Mar 2017 16:50:20 +0000 (16:50 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492  -s ours am: 1b9f1e8156  -s ours am: b3b5777fff am: bff6f7d991  -s ours
am: b65c93dbcf

Change-Id: I64613daf3496d52137f8bb51b0624d05590a308b

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca -s...
Adam Seaton [Thu, 16 Mar 2017 16:50:17 +0000 (16:50 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca  -s ours am: 9921f826fe am: 88ba3a3bf8  -s ours am: fc869b58e8 am: 959da97bba am: 7f4fbb79ac
am: 9754351b7c  -s ours

Change-Id: I19ffcce5be291de5b4afcb49c233829101c34038

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am...
Adam Seaton [Thu, 16 Mar 2017 16:50:14 +0000 (16:50 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302  -s ours am: 5e0c5f0263  -s ours am: 8edd5d7e30 am: 5af5f2c46f  -s ours
am: e1d7ca1ec7

Change-Id: Idf8c58e418176e8a24f7d06cde5c359d093671a5

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277 -s...
Adam Seaton [Thu, 16 Mar 2017 16:50:13 +0000 (16:50 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277  -s ours am: 637f66925f am: 3481be638f  -s ours am: d4f9e95f7c am: 6962385144 am: 128b958afb
am: 43cbfe0486  -s ours

Change-Id: Iee5da90d3503c3822d433d76d86e6aba50b37b8d

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca -s...
Adam Seaton [Thu, 16 Mar 2017 16:47:50 +0000 (16:47 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca  -s ours am: 9921f826fe am: 88ba3a3bf8  -s ours am: fc869b58e8 am: 959da97bba
am: 7f4fbb79ac

Change-Id: I74f2e2433f64b5d6ea5e26ea80b1f7280439babc

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am...
Adam Seaton [Thu, 16 Mar 2017 16:47:49 +0000 (16:47 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492  -s ours am: 1b9f1e8156  -s ours am: b3b5777fff
am: bff6f7d991  -s ours

Change-Id: Ic9c4aff7a22aee77a341164e3c49b5c521a370cd

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am...
Adam Seaton [Thu, 16 Mar 2017 16:47:44 +0000 (16:47 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302  -s ours am: 5e0c5f0263  -s ours am: 8edd5d7e30
am: 5af5f2c46f  -s ours

Change-Id: Ia45004d7e5396f1add6121c4040e85efe0faa319

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277 -s...
Adam Seaton [Thu, 16 Mar 2017 16:47:44 +0000 (16:47 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277  -s ours am: 637f66925f am: 3481be638f  -s ours am: d4f9e95f7c am: 6962385144
am: 128b958afb

Change-Id: I4ff8bdff23c0e3b5ac5637f8c2a90737b35a109d

7 years agoreleasetools: Support generating downgrade A/B OTAs.
Tao Bao [Tue, 7 Feb 2017 19:21:17 +0000 (11:21 -0800)]
releasetools: Support generating downgrade A/B OTAs.

We already support generating downgrade OTAs for non-A/B devices (with
mandatory data wipe), but we have missed the --downgrade flag in A/B OTA
path.

This CL factors out the function that writes the downgrade metadata, and
fixes the path for generating A/B OTAs.

Bug: 35094540
Bug: 36183651
Test: Generate incrementals with --downgrade for A/B and non-A/B OTAs.
Change-Id: I30b9bf83e69e8aba3be666507681b555db6ab743
Merged-In: I30b9bf83e69e8aba3be666507681b555db6ab743
(cherry picked from commit b31892e5de3259e5bcce3b43399f9fa7f723f81d)

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca -s...
Adam Seaton [Thu, 16 Mar 2017 16:44:50 +0000 (16:44 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca  -s ours am: 9921f826fe am: 88ba3a3bf8  -s ours am: fc869b58e8
am: 959da97bba

Change-Id: Ia9eba2faa155043c5e0da2122c1a204f7e5d19b3

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am...
Adam Seaton [Thu, 16 Mar 2017 16:44:49 +0000 (16:44 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492  -s ours am: 1b9f1e8156  -s ours
am: b3b5777fff

Change-Id: Ie1e065ba9a5ec8342794bee335ee7e1e63e415fa

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev am: fa157ee487 am...
Adam Seaton [Thu, 16 Mar 2017 16:44:48 +0000 (16:44 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev am: fa157ee487 am: e4ced7a432 am: 84869ab1e2
am: 7723fd8988  -s ours

Change-Id: I3caa1ea57196219d92a353adff18b00cccb9d273

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am...
Adam Seaton [Thu, 16 Mar 2017 16:44:44 +0000 (16:44 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302  -s ours am: 5e0c5f0263  -s ours
am: 8edd5d7e30

Change-Id: I1af375875167b1f62073c20eb3ef3ce4c95d9f89

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277 -s...
Adam Seaton [Thu, 16 Mar 2017 16:44:44 +0000 (16:44 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277  -s ours am: 637f66925f am: 3481be638f  -s ours am: d4f9e95f7c
am: 6962385144

Change-Id: I94de1376e0d7a0d4d6e32c9562e7328b3dd106d5

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev am: 07a0f6968d am...
Adam Seaton [Thu, 16 Mar 2017 16:44:43 +0000 (16:44 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev am: 07a0f6968d am: 5281508c37 am: bb768aa837
am: 92380f630e  -s ours

Change-Id: I8a51b543b0269b92ca87f80bdc5a91db3dacb84e

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca -s...
Adam Seaton [Thu, 16 Mar 2017 16:41:49 +0000 (16:41 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca  -s ours am: 9921f826fe am: 88ba3a3bf8  -s ours
am: fc869b58e8

Change-Id: Ibd6463edf17bebc31ff43676d9a8b22314524577

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev am: fa157ee487 am...
Adam Seaton [Thu, 16 Mar 2017 16:41:49 +0000 (16:41 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev am: fa157ee487 am: e4ced7a432
am: 84869ab1e2

Change-Id: I9c5be058a27139b73fb331248c682f17a9bfbfe1

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am...
Adam Seaton [Thu, 16 Mar 2017 16:41:47 +0000 (16:41 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492  -s ours
am: 1b9f1e8156  -s ours

Change-Id: I05a6a8899f3c974934ab8929642fc17f4131dacc

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am...
Adam Seaton [Thu, 16 Mar 2017 16:41:44 +0000 (16:41 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302  -s ours
am: 5e0c5f0263  -s ours

Change-Id: I9a9c1d88f083e3284c0f5aa29c60b436a02991d7

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277 -s...
Adam Seaton [Thu, 16 Mar 2017 16:41:44 +0000 (16:41 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277  -s ours am: 637f66925f am: 3481be638f  -s ours
am: d4f9e95f7c

Change-Id: Ic92722bd08f326c4c7e99a36ec6b8d4ff6f4caae

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev am: 07a0f6968d am...
Adam Seaton [Thu, 16 Mar 2017 16:41:44 +0000 (16:41 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev am: 07a0f6968d am: 5281508c37
am: bb768aa837

Change-Id: Ia9e209b1b11712230b2e0ce4a968e2c119b4dd9c

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev am: fa157ee487
Adam Seaton [Thu, 16 Mar 2017 16:39:19 +0000 (16:39 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev am: fa157ee487
am: e4ced7a432

Change-Id: I03e2baa012ecec53cd62d098d9b57f0f1c8b33f6

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca -s...
Adam Seaton [Thu, 16 Mar 2017 16:39:17 +0000 (16:39 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca  -s ours am: 9921f826fe
am: 88ba3a3bf8  -s ours

Change-Id: I938c87c6381b0a9b3879af9ac16c85c82628d6c6

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am...
Adam Seaton [Thu, 16 Mar 2017 16:39:16 +0000 (16:39 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49
am: 4826d7e492  -s ours

Change-Id: Icd9c4018e5dc1b9f7857c8d3ca427381edd1beed

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277 -s...
Adam Seaton [Thu, 16 Mar 2017 16:39:13 +0000 (16:39 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277  -s ours am: 637f66925f
am: 3481be638f  -s ours

Change-Id: I65dba25b8055f2339723905b06da9723ba4b5f6a

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev am: 07a0f6968d
Adam Seaton [Thu, 16 Mar 2017 16:39:13 +0000 (16:39 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev am: 07a0f6968d
am: 5281508c37

Change-Id: I2b758951b7d5c496cd060621ebda3afe1b72f6ea

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am...
Adam Seaton [Thu, 16 Mar 2017 16:39:12 +0000 (16:39 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690
am: 645af9a302  -s ours

Change-Id: I53784956ca6ec3d1b8f8585bfc547a8bfaee3f3e

7 years agoUpdate Security String to 2017-05-05 on nyc-dev
Adam Seaton [Fri, 10 Mar 2017 23:44:57 +0000 (15:44 -0800)]
Update Security String to 2017-05-05 on nyc-dev

Bug:34137924

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca -s...
Adam Seaton [Thu, 16 Mar 2017 16:36:18 +0000 (16:36 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca  -s ours
am: 9921f826fe

Change-Id: I5b5b9756e27e84edb95b5492140c47be3b200df0

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev
Adam Seaton [Thu, 16 Mar 2017 16:36:18 +0000 (16:36 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev
am: fa157ee487

Change-Id: I417423cc171b4906dac7d0707a358b6fc85a02d9

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a
Adam Seaton [Thu, 16 Mar 2017 16:36:17 +0000 (16:36 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a
am: f19c200a49

Change-Id: I2619378284b988335721a9d379efcae9e634e7a8

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277 -s...
Adam Seaton [Thu, 16 Mar 2017 16:36:14 +0000 (16:36 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277  -s ours
am: 637f66925f

Change-Id: I16eaed880c8c82a432783565541be9292df620b4

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev
Adam Seaton [Thu, 16 Mar 2017 16:36:14 +0000 (16:36 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev
am: 07a0f6968d

Change-Id: I2712458e76c2d43f946130b74feb42b31d75f1f8

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467
Adam Seaton [Thu, 16 Mar 2017 16:36:14 +0000 (16:36 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467
am: 7b35a39690

Change-Id: Iac15bfd4018b152302e13f12a0f5a05e85d010e4

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on klp-dev
Adam Seaton [Thu, 16 Mar 2017 16:32:46 +0000 (16:32 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev
am: 3d0850957a

Change-Id: I4d62b1d3b809b1be366b649d6cd2cf036f0020b3

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev
Adam Seaton [Thu, 16 Mar 2017 16:32:45 +0000 (16:32 +0000)]
DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev
am: baf29229ca  -s ours

Change-Id: Ie6771d5808069e6285b7497b013de430d1dad818

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on klp-dev
Adam Seaton [Thu, 16 Mar 2017 16:32:43 +0000 (16:32 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev
am: 41d659c467

Change-Id: I132559a9f492d3220ab8861e3575d27cb1635646

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev
Adam Seaton [Thu, 16 Mar 2017 16:32:42 +0000 (16:32 +0000)]
DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev
am: e0b38c6277  -s ours

Change-Id: Idcd643e5e7ce612f567b3ca8a64b9e0880108423

7 years agoUpdate Security String to 2017-05-01 on nyc-dev
Adam Seaton [Fri, 10 Mar 2017 23:44:16 +0000 (15:44 -0800)]
Update Security String to 2017-05-01 on nyc-dev

Bug:34137924

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev
Adam Seaton [Fri, 10 Mar 2017 23:43:10 +0000 (15:43 -0800)]
DO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev

Bug:34137924

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev
Adam Seaton [Fri, 10 Mar 2017 23:42:17 +0000 (15:42 -0800)]
DO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev

Bug:34137924

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev
Adam Seaton [Fri, 10 Mar 2017 23:37:38 +0000 (15:37 -0800)]
DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev

Bug:34137924

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev
Adam Seaton [Fri, 10 Mar 2017 23:36:31 +0000 (15:36 -0800)]
DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev

Bug:34137924

7 years agoDO NOT MERGE : Update Security String to 2017-05-05 on klp-dev
Adam Seaton [Fri, 10 Mar 2017 23:34:58 +0000 (15:34 -0800)]
DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev

Bug:36137924

7 years agoDO NOT MERGE : Update Security String to 2017-05-01 on klp-dev
Adam Seaton [Fri, 10 Mar 2017 23:31:30 +0000 (15:31 -0800)]
DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev

Bug:36137924

7 years agoMake the packaging of VBOOT_SIGNER tools conditional.
Tao Bao [Thu, 23 Feb 2017 00:38:19 +0000 (16:38 -0800)]
Make the packaging of VBOOT_SIGNER tools conditional.

Otherwise it may fail the targets that don't have
external/vboot_reference in the manifest.

Bug: 35467608
Test: lunch aosp_dragon-userdebug; m otatools-package
Test: lunch aosp_bullhead-userdebug; m otatools-package
Change-Id: I35700a4d7d0723992badcfb4a03be85d07a4b9a9
(cherry picked from commit d2aed4309a5f3c9c47013b56a6eab555cf7b12f7)

7 years agoRevert "Revert "releasetools: Allow using futility-host to sign old TF.zip.""
Tao Bao [Thu, 23 Feb 2017 19:04:36 +0000 (11:04 -0800)]
Revert "Revert "releasetools: Allow using futility-host to sign old TF.zip.""

This reverts commit d6145b6a160a7c171269d9408a675d8ff4f08283.

The cause of the earlier breakage has been identified and fixed by
commit 4b577413ff5c43e9b857f5c1685d6909e7ca27ba.

Bug: 35467608
Test: lunch ryu-userdebug; m dist otatools-package
(cherry picked from commit 4f30f7cfa1a46a90a1c60d81330c45d25c160aa8)

7 years agoRevert "Revert "Build FUTILITY tool from futility-host.""
Tao Bao [Thu, 23 Feb 2017 19:03:45 +0000 (11:03 -0800)]
Revert "Revert "Build FUTILITY tool from futility-host.""

This reverts commit b9186f2b523318a5f505c253c67974f4075d9369.

The cause of the earlier breakage has been identified and fixed by
commit 4b577413ff5c43e9b857f5c1685d6909e7ca27ba.

Bug: 35467608
Test: lunch ryu-userdebug; m otatools-package
Change-Id: I0ca329a3844b7d5d74443f7495b363e0f1c1c391
(cherry picked from commit 9b524ef60d4204d87cda165c7ec034ef1dab1b29)

7 years agoMakefile: Add the missing dependency on FUTILITY.
Tao Bao [Thu, 23 Feb 2017 06:54:39 +0000 (22:54 -0800)]
Makefile: Add the missing dependency on FUTILITY.

Bug: 35467608
Test: lunch aosp_dragon-userdebug; m dist
Change-Id: If3824ac22926f3c3cc09d5b82cb0f6da4132f937
(cherry picked from commit 4b577413ff5c43e9b857f5c1685d6909e7ca27ba)

7 years agoMerge "Revert "releasetools: Allow using futility-host to sign old TF.zip."" into...
Tao Bao [Tue, 21 Feb 2017 20:29:37 +0000 (20:29 +0000)]
Merge "Revert "releasetools: Allow using futility-host to sign old TF.zip."" into nyc-dev

7 years agoRevert "releasetools: Allow using futility-host to sign old TF.zip."
Tao Bao [Tue, 21 Feb 2017 20:27:27 +0000 (20:27 +0000)]
Revert "releasetools: Allow using futility-host to sign old TF.zip."

Broke ryu targets.

This reverts commit 31a0de00a4b44fa1a8ac32c44cf16e609bd70225.

Change-Id: I3ffcdc604a1cb92c86c574b5cd358d0148430d55

7 years agoMerge "Revert "Build FUTILITY tool from futility-host."" into nyc-dev
Tao Bao [Tue, 21 Feb 2017 18:55:34 +0000 (18:55 +0000)]
Merge "Revert "Build FUTILITY tool from futility-host."" into nyc-dev

7 years agoRevert "Build FUTILITY tool from futility-host."
Tao Bao [Tue, 21 Feb 2017 18:44:24 +0000 (18:44 +0000)]
Revert "Build FUTILITY tool from futility-host."

Broke ryu targets.

This reverts commit a7726c1e3637d9c7cc3be7d2c987f95688354f17.

Change-Id: Icec9da939a50c794b15ba3f40e8307f8829254c7

7 years agoreleasetools: Allow using futility-host to sign old TF.zip.
Tao Bao [Sat, 18 Feb 2017 07:21:31 +0000 (23:21 -0800)]
releasetools: Allow using futility-host to sign old TF.zip.

Commit e98fb7a8d3a460891f6c21fafbe62a86b50d3d1d switched to using
futility-host instead of the prebuilt futility. This CL adds support to
handle signing old TF.zip that still says "futility=prebuilt/..." in
META/misc_info.txt.

Bug: 35467608
Test: Generate otatools.zip and sign an old ryu TF.zip.
Change-Id: I48a9cc918c7afce361e1ec9bc4f85f74fa92566e
(cherry picked from commit 4f104d1b94990a101031c1b806aab00594b3e5b4)

7 years agoBuild FUTILITY tool from futility-host.
Tao Bao [Fri, 17 Feb 2017 22:11:13 +0000 (14:11 -0800)]
Build FUTILITY tool from futility-host.

Also pack the tool, vboot_signer.sh script and the test keys into
otatools.zip. This allows signing ryu target without a source repo.

Bug: 35467608
Test: m otatools-package and check the newly included files.
Test: Use otatools.zip to sign a ryu target.
Change-Id: I70f7b359f21a579463d5c7251daac81a97e338cc
(cherry picked from commit e98fb7a8d3a460891f6c21fafbe62a86b50d3d1d)

7 years ago[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am...
Adam Seaton [Mon, 13 Feb 2017 23:38:42 +0000 (23:38 +0000)]
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76  -s ours am: 8f86884a97  -s ours am: c901cec8b2 am: a150db6547  -s ours am: 28ecd6fdd5 am: 58300f46bf am: 764c206e6d
am: 533ca31c93  -s ours

Change-Id: Ieb70f91622319054da2c811e2d0abecd4125ed9d

7 years ago[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am...
Adam Seaton [Mon, 13 Feb 2017 23:38:38 +0000 (23:38 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4 am: ed38784898  -s ours am: 84702d9919  -s ours am: d466175346 am: bc19d8140c  -s ours am: 53a64664c9 am: caff84dcbe am: 2f222829e0
am: 69586d29d7  -s ours

Change-Id: I170ef47942f401b2157fac0e5b64b62248af51f7

7 years ago[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am...
Adam Seaton [Mon, 13 Feb 2017 23:35:44 +0000 (23:35 +0000)]
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76  -s ours am: 8f86884a97  -s ours am: c901cec8b2 am: a150db6547  -s ours am: 28ecd6fdd5 am: 58300f46bf
am: 764c206e6d

Change-Id: Iebaf610eaf7eb44a2bf5b2c29b76eec0d35f2e3b

7 years ago[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am...
Adam Seaton [Mon, 13 Feb 2017 23:35:39 +0000 (23:35 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4 am: ed38784898  -s ours am: 84702d9919  -s ours am: d466175346 am: bc19d8140c  -s ours am: 53a64664c9 am: caff84dcbe
am: 2f222829e0

Change-Id: Ia195157ac55b1bfa35c206614a813f3e1585134f

7 years ago[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am...
Adam Seaton [Mon, 13 Feb 2017 23:32:13 +0000 (23:32 +0000)]
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76  -s ours am: 8f86884a97  -s ours am: c901cec8b2 am: a150db6547  -s ours am: 28ecd6fdd5
am: 58300f46bf

Change-Id: If3f378886a2a36d0af478f6a44d8db64e83832a8

7 years ago[DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee -s...
Adam Seaton [Mon, 13 Feb 2017 23:32:12 +0000 (23:32 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee  -s ours am: ea757ba690 am: 37aab729cf  -s ours am: 8a59a2eda2 am: 3746e17d30 am: b15a2623ac
am: 4be162ac7f  -s ours

Change-Id: I3b52aeff547b3c2cd4c3448029f28ec79f0fa592

7 years ago[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am...
Adam Seaton [Mon, 13 Feb 2017 23:32:08 +0000 (23:32 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4 am: ed38784898  -s ours am: 84702d9919  -s ours am: d466175346 am: bc19d8140c  -s ours am: 53a64664c9
am: caff84dcbe

Change-Id: I49c8960797099da97ab452e91e7c3d4ecfde3d4f

7 years ago[DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev am: ffab69998a -s...
Adam Seaton [Mon, 13 Feb 2017 23:32:07 +0000 (23:32 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev am: ffab69998a  -s ours am: 0f30aa9801 am: 05ebddebe5  -s ours am: 101c043b17 am: 58086ff4aa am: fec9d76740
am: ea0d4b0e54  -s ours

Change-Id: I5ee2a63e6af746efd35e1aaa978345e2d505b7aa

7 years ago[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am...
Adam Seaton [Mon, 13 Feb 2017 23:29:43 +0000 (23:29 +0000)]
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76  -s ours am: 8f86884a97  -s ours am: c901cec8b2 am: a150db6547  -s ours
am: 28ecd6fdd5

Change-Id: I9d39e4f7cce7dcf22f9cb4291da89f5d1107c305

7 years ago[DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee -s...
Adam Seaton [Mon, 13 Feb 2017 23:29:42 +0000 (23:29 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee  -s ours am: ea757ba690 am: 37aab729cf  -s ours am: 8a59a2eda2 am: 3746e17d30
am: b15a2623ac

Change-Id: I5b374785d84f6affc879a4bbd0705f1c6d09e0fa

7 years ago[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am...
Adam Seaton [Mon, 13 Feb 2017 23:29:38 +0000 (23:29 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4 am: ed38784898  -s ours am: 84702d9919  -s ours am: d466175346 am: bc19d8140c  -s ours
am: 53a64664c9

Change-Id: I9241ca2872d5b44869daa89e61be0dc99c42c8f7

7 years ago[DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev am: ffab69998a -s...
Adam Seaton [Mon, 13 Feb 2017 23:29:37 +0000 (23:29 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev am: ffab69998a  -s ours am: 0f30aa9801 am: 05ebddebe5  -s ours am: 101c043b17 am: 58086ff4aa
am: fec9d76740

Change-Id: I70bd052bfddbd2cd926bc547a54d4831d63831f1

7 years ago[DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee -s...
Adam Seaton [Mon, 13 Feb 2017 23:26:41 +0000 (23:26 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee  -s ours am: ea757ba690 am: 37aab729cf  -s ours am: 8a59a2eda2
am: 3746e17d30

Change-Id: I0289dd868164312ae2702b57893e160e60fcdfee

7 years ago[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am...
Adam Seaton [Mon, 13 Feb 2017 23:26:40 +0000 (23:26 +0000)]
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76  -s ours am: 8f86884a97  -s ours am: c901cec8b2
am: a150db6547  -s ours

Change-Id: I8f82b3f68accb57beaeb25dd88b057062597bfdf

7 years ago[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am...
Adam Seaton [Mon, 13 Feb 2017 23:26:37 +0000 (23:26 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4 am: ed38784898  -s ours am: 84702d9919  -s ours am: d466175346
am: bc19d8140c  -s ours

Change-Id: I7a7a9e0fa88aa5f1e70ad62bd5c1854eae885a1b

7 years ago[DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev am: ffab69998a -s...
Adam Seaton [Mon, 13 Feb 2017 23:26:37 +0000 (23:26 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev am: ffab69998a  -s ours am: 0f30aa9801 am: 05ebddebe5  -s ours am: 101c043b17
am: 58086ff4aa

Change-Id: Ia7831d78a8cb2f0604051b5297b2f3236e1ae36f

7 years ago[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am...
Adam Seaton [Mon, 13 Feb 2017 23:24:42 +0000 (23:24 +0000)]
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76  -s ours am: 8f86884a97  -s ours
am: c901cec8b2

Change-Id: Ie35c57a24abb4638ac3372d42913d3e4cad5410a

7 years ago[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am...
Adam Seaton [Mon, 13 Feb 2017 23:24:37 +0000 (23:24 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4 am: ed38784898  -s ours am: 84702d9919  -s ours
am: d466175346

Change-Id: I0fc9d82d3181bbf98cc5c35bd7f0be9c593b785d

7 years ago[DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee -s...
Adam Seaton [Mon, 13 Feb 2017 23:24:15 +0000 (23:24 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee  -s ours am: ea757ba690 am: 37aab729cf  -s ours
am: 8a59a2eda2

Change-Id: Ieec27d7f6fda4f30bfb1f94d43a48da75bf7cc73

7 years ago[DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev am: ffab69998a -s...
Adam Seaton [Mon, 13 Feb 2017 23:24:07 +0000 (23:24 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev am: ffab69998a  -s ours am: 0f30aa9801 am: 05ebddebe5  -s ours
am: 101c043b17

Change-Id: Ia2e087b52c7bb4f3c8249d95d0b4b94bf9ba2a6c

7 years ago[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am...
Adam Seaton [Mon, 13 Feb 2017 23:21:40 +0000 (23:21 +0000)]
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76  -s ours
am: 8f86884a97  -s ours

Change-Id: I46d21630e67552086c193d65d78d86e8b96872d1

7 years ago[DO NOT MERGE] Update Security String to 2017-04-05 for mnc-dev am: af15999c69 am...
Adam Seaton [Mon, 13 Feb 2017 23:21:40 +0000 (23:21 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-05 for mnc-dev am: af15999c69 am: f23c50fe08 am: ed7c7adb7e
am: 46594018ce  -s ours

Change-Id: If700d4cf2d0133dc4114aba1fdeb7001d4c1f2e6

7 years ago[DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee -s...
Adam Seaton [Mon, 13 Feb 2017 23:21:40 +0000 (23:21 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7ee  -s ours am: ea757ba690
am: 37aab729cf  -s ours

Change-Id: I8b884d67b4d9b1e430937f66a4b2743812970de1

7 years ago[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am...
Adam Seaton [Mon, 13 Feb 2017 23:21:36 +0000 (23:21 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4 am: ed38784898  -s ours
am: 84702d9919  -s ours

Change-Id: I872c7ff88088a3f7417aa5a1afec4856b21a8803