OSDN Git Service
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)
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)
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)
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)
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)
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
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
Tao Bao [Tue, 21 Feb 2017 18:55:34 +0000 (18:55 +0000)]
Merge "Revert "Build FUTILITY tool from futility-host."" into nyc-dev
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
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)
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)
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Adam Seaton [Mon, 13 Feb 2017 23:21:36 +0000 (23:21 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev am:
ffab69998a -s ours am:
0f30aa9801
am:
05ebddebe5 -s ours
Change-Id: Ic61760aacd2b93abe2dddfb4254911c1b055dd0d
Adam Seaton [Mon, 13 Feb 2017 23:21:36 +0000 (23:21 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 for mnc-dev am:
06a57496e6 am:
a3e5f184eb am:
775af5ae5b
am:
6ebebd3ee3 -s ours
Change-Id: Icc3ceb4098f8f95b60ba8655d40bb50aa188ff3f
Adam Seaton [Mon, 13 Feb 2017 23:18:41 +0000 (23:18 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-05 for mnc-dev am:
af15999c69 am:
f23c50fe08
am:
ed7c7adb7e
Change-Id: Ic49d0b79e0ed810e4c89e87f7bd77ab86723a39a
Adam Seaton [Mon, 13 Feb 2017 23:18:40 +0000 (23:18 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am:
e2eff3f7ee -s ours
am:
ea757ba690
Change-Id: I98681c4fab9d411ea71e598d92349fabfb5ac207
Adam Seaton [Mon, 13 Feb 2017 23:18:39 +0000 (23:18 +0000)]
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am:
502366cdc4 am:
3ce29b8a94
am:
b0cef41b76 -s ours
Change-Id: Ia5ab2a5e1fb3a168a28b039de6ba1028352b09d1
Adam Seaton [Mon, 13 Feb 2017 23:18:36 +0000 (23:18 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev am:
ffab69998a -s ours
am:
0f30aa9801
Change-Id: I28750b553efd321426fe9f83a185337381e9cf48
Adam Seaton [Mon, 13 Feb 2017 23:18:36 +0000 (23:18 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 for mnc-dev am:
06a57496e6 am:
a3e5f184eb
am:
775af5ae5b
Change-Id: I8cff31a4fd9f090b385a3c8a23f028a0f6f53a49
Adam Seaton [Mon, 13 Feb 2017 23:18:35 +0000 (23:18 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am:
00c627eb31 am:
5be6d3bbb4
am:
ed38784898 -s ours
Change-Id: I1dac91eb4bcc2811d64193ee684735d3b3430900
Adam Seaton [Mon, 13 Feb 2017 23:16:14 +0000 (23:16 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-05 for mnc-dev am:
af15999c69
am:
f23c50fe08
Change-Id: Ie0b24362b57a93b3200df7b1df518b6b0504f6f1
Adam Seaton [Mon, 13 Feb 2017 23:16:12 +0000 (23:16 +0000)]
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am:
502366cdc4
am:
3ce29b8a94
Change-Id: Ib13337116f814cb65ef48f44fc1215658314276b
Adam Seaton [Mon, 13 Feb 2017 23:16:11 +0000 (23:16 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev
am:
e2eff3f7ee -s ours
Change-Id: I53d0d7185ecd9a345f0c36bd3951672048f5c091
Adam Seaton [Mon, 13 Feb 2017 23:16:08 +0000 (23:16 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 for mnc-dev am:
06a57496e6
am:
a3e5f184eb
Change-Id: Iba9014d2e3465635a0a81b69e0ea12756875f3c2
Adam Seaton [Mon, 13 Feb 2017 23:16:07 +0000 (23:16 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev
am:
ffab69998a -s ours
Change-Id: I0f0531ca29601893b29113c2c4bb1b07c1afbef8
Adam Seaton [Mon, 13 Feb 2017 23:16:07 +0000 (23:16 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am:
00c627eb31
am:
5be6d3bbb4
Change-Id: I083c83fba91daaa2aabc52087cd1edb89d12f052
Adam Seaton [Mon, 13 Feb 2017 23:13:40 +0000 (23:13 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-05 for mnc-dev
am:
af15999c69
Change-Id: Iff5f8217e962356f28f299611091ff3fe4fe5522
Adam Seaton [Mon, 13 Feb 2017 23:13:38 +0000 (23:13 +0000)]
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev
am:
502366cdc4
Change-Id: Ic1ae0f5e03c24e616beba5413636468de4c363f1
Adam Seaton [Mon, 13 Feb 2017 23:13:36 +0000 (23:13 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 for mnc-dev
am:
06a57496e6
Change-Id: Ic7678fe525e80da82db2dfa866a38a885c470df1
Adam Seaton [Mon, 13 Feb 2017 23:13:35 +0000 (23:13 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev
am:
00c627eb31
Change-Id: Ife5e0bf0df722c7b1716b821e1e3b0503da169b3
Adam Seaton [Mon, 13 Feb 2017 19:49:59 +0000 (11:49 -0800)]
Update Security String to 2017-04-05 on nyc-dev
Bug:
35314737
Adam Seaton [Mon, 13 Feb 2017 19:48:25 +0000 (11:48 -0800)]
Update Security String to 2017-04-01 on nyc-dev
Bug:
35314737
Adam Seaton [Mon, 13 Feb 2017 19:44:01 +0000 (11:44 -0800)]
[DO NOT MERGE] Update Security String to 2017-04-05 for mnc-dev
bug:
35314737
Adam Seaton [Mon, 13 Feb 2017 19:42:20 +0000 (11:42 -0800)]
[DO NOT MERGE] Update Security String to 2017-04-01 for mnc-dev
Bug:
35314737
Adam Seaton [Mon, 13 Feb 2017 19:37:34 +0000 (11:37 -0800)]
[DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev
Bug:
35314737
Adam Seaton [Mon, 13 Feb 2017 19:35:39 +0000 (11:35 -0800)]
[DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev
Bug:
35314737
Adam Seaton [Mon, 13 Feb 2017 19:28:20 +0000 (11:28 -0800)]
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev
Bug:
35314737
Adam Seaton [Mon, 13 Feb 2017 19:25:59 +0000 (11:25 -0800)]
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev
b/
35314373
Adam Seaton [Tue, 17 Jan 2017 23:31:18 +0000 (23:31 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/
34345751 am:
3597d69559 am:
97c071f5ae am:
61c5e5075c -s ours am:
074c3265aa -s ours am:
2e9eb28b99 am:
fef824f53d -s ours am:
e5d862ad75 am:
2fff24ead3 am:
e85f5851e4
am:
5c2bd9cb75 -s ours
Change-Id: I098e7e2d99ad971f909fbc26bfe299b6e5b52539
Adam Seaton [Tue, 17 Jan 2017 23:31:12 +0000 (23:31 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am:
6cece247c4 am:
a66bd3ad13 am:
26cd6d4d12 -s ours am:
f5ef1d35de -s ours am:
70e501326e am:
e13222c98f -s ours am:
ed4222f439 am:
1e907b8fe6 am:
e61f600b82
am:
1d806358f5 -s ours
Change-Id: If0134b69b41792c47c5bef358a1857c30963a523
Adam Seaton [Tue, 17 Jan 2017 23:29:17 +0000 (23:29 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/
34345751 am:
3597d69559 am:
97c071f5ae am:
61c5e5075c -s ours am:
074c3265aa -s ours am:
2e9eb28b99 am:
fef824f53d -s ours am:
e5d862ad75 am:
2fff24ead3
am:
e85f5851e4
Change-Id: Ib9d0d117eb379ba037c6299d828f9b4bed8a5838
Adam Seaton [Tue, 17 Jan 2017 23:29:12 +0000 (23:29 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am:
6cece247c4 am:
a66bd3ad13 am:
26cd6d4d12 -s ours am:
f5ef1d35de -s ours am:
70e501326e am:
e13222c98f -s ours am:
ed4222f439 am:
1e907b8fe6
am:
e61f600b82
Change-Id: I3014cb7806425931cad35a4cbe70878ff6c81908
Adam Seaton [Tue, 17 Jan 2017 23:27:17 +0000 (23:27 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/
34345751 am:
3597d69559 am:
97c071f5ae am:
61c5e5075c -s ours am:
074c3265aa -s ours am:
2e9eb28b99 am:
fef824f53d -s ours am:
e5d862ad75
am:
2fff24ead3
Change-Id: I3a9396fe2ad2d52864641825c3c14bfc2557af22
Adam Seaton [Tue, 17 Jan 2017 23:27:11 +0000 (23:27 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am:
6cece247c4 am:
a66bd3ad13 am:
26cd6d4d12 -s ours am:
f5ef1d35de -s ours am:
70e501326e am:
e13222c98f -s ours am:
ed4222f439
am:
1e907b8fe6
Change-Id: I29f633a3337caac40bc41634856ddffdedec2ffb
Adam Seaton [Tue, 17 Jan 2017 23:24:47 +0000 (23:24 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/
34345751 am:
3597d69559 am:
97c071f5ae am:
61c5e5075c -s ours am:
074c3265aa -s ours am:
2e9eb28b99 am:
fef824f53d -s ours
am:
e5d862ad75
Change-Id: Ib3083a0d30e4567a39d6a51a97cae86ab502a2f0
Adam Seaton [Tue, 17 Jan 2017 23:24:46 +0000 (23:24 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am:
84888652e0 -s ours am:
d438fc526d am:
b40dc64ed2 -s ours am:
0a46d4edcf am:
59cd888132 am:
f3d5948c42
am:
0a25d51000 -s ours
Change-Id: I4da6286d07d2d9c79a7d97047fd3a67d171dc2b7
Adam Seaton [Tue, 17 Jan 2017 23:24:41 +0000 (23:24 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am:
6cece247c4 am:
a66bd3ad13 am:
26cd6d4d12 -s ours am:
f5ef1d35de -s ours am:
70e501326e am:
e13222c98f -s ours
am:
ed4222f439
Change-Id: I6cd235eb84aa59498aae75297cdb981a1d1d0be3
Adam Seaton [Tue, 17 Jan 2017 23:24:40 +0000 (23:24 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am:
28dae4b62b -s ours am:
b0d0a4ec9b am:
80bc7863c8 -s ours am:
151506a2a3 am:
4a0196f3e3 am:
536287567a
am:
98afadbfc7 -s ours
Change-Id: Ib23117fcd49472ae70ed216b71c31a53a82dc5bc
Adam Seaton [Tue, 17 Jan 2017 23:23:16 +0000 (23:23 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am:
84888652e0 -s ours am:
d438fc526d am:
b40dc64ed2 -s ours am:
0a46d4edcf am:
59cd888132
am:
f3d5948c42
Change-Id: I8400317cf9ef4cf83256718f6d4fa562c03a8af7
Adam Seaton [Tue, 17 Jan 2017 23:23:14 +0000 (23:23 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/
34345751 am:
3597d69559 am:
97c071f5ae am:
61c5e5075c -s ours am:
074c3265aa -s ours am:
2e9eb28b99
am:
fef824f53d -s ours
Change-Id: I7be66d0a47c43b2ab53861d6081977d0909b4fab
Adam Seaton [Tue, 17 Jan 2017 23:23:11 +0000 (23:23 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am:
28dae4b62b -s ours am:
b0d0a4ec9b am:
80bc7863c8 -s ours am:
151506a2a3 am:
4a0196f3e3
am:
536287567a
Change-Id: I1ae27549bdc3b6e476eaa97ff732f913048a9b78
Adam Seaton [Tue, 17 Jan 2017 23:23:10 +0000 (23:23 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am:
6cece247c4 am:
a66bd3ad13 am:
26cd6d4d12 -s ours am:
f5ef1d35de -s ours am:
70e501326e
am:
e13222c98f -s ours
Change-Id: Idea0c6f437dc93b9e6e85c789f246eb31ff954ab
Adam Seaton [Tue, 17 Jan 2017 23:21:16 +0000 (23:21 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/
34345751 am:
3597d69559 am:
97c071f5ae am:
61c5e5075c -s ours am:
074c3265aa -s ours
am:
2e9eb28b99
Change-Id: Ibe706cda88ec49c2263961f4b6e8e4afa8851653
Adam Seaton [Tue, 17 Jan 2017 23:21:16 +0000 (23:21 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am:
84888652e0 -s ours am:
d438fc526d am:
b40dc64ed2 -s ours am:
0a46d4edcf
am:
59cd888132
Change-Id: Iacf37b8a4f0871a4ebdd2ac6be36f6f733815a01
Adam Seaton [Tue, 17 Jan 2017 23:21:12 +0000 (23:21 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am:
6cece247c4 am:
a66bd3ad13 am:
26cd6d4d12 -s ours am:
f5ef1d35de -s ours
am:
70e501326e
Change-Id: I04132b3bd74b480aa5fae0afb80b609a2b5eb5be
Adam Seaton [Tue, 17 Jan 2017 23:21:11 +0000 (23:21 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am:
28dae4b62b -s ours am:
b0d0a4ec9b am:
80bc7863c8 -s ours am:
151506a2a3
am:
4a0196f3e3
Change-Id: I93459d2087188d6c0340e5e180f0f9ee34696ff9
Adam Seaton [Tue, 17 Jan 2017 23:18:45 +0000 (23:18 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am:
84888652e0 -s ours am:
d438fc526d am:
b40dc64ed2 -s ours
am:
0a46d4edcf
Change-Id: I3a6449f14afc20983641b7ed14b69e2a32921552
Adam Seaton [Tue, 17 Jan 2017 23:18:45 +0000 (23:18 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098 am:
cc7fef92de
am:
bc83db626c -s ours
Change-Id: I1c943055a98563f7d3c6ebb1b10975119e3fd809
Adam Seaton [Tue, 17 Jan 2017 23:18:44 +0000 (23:18 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/
34345751 am:
3597d69559 am:
97c071f5ae am:
61c5e5075c -s ours
am:
074c3265aa -s ours
Change-Id: I4b0a32711487dc322a10175211049df6983a1a05
Adam Seaton [Tue, 17 Jan 2017 23:18:41 +0000 (23:18 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am:
28dae4b62b -s ours am:
b0d0a4ec9b am:
80bc7863c8 -s ours
am:
151506a2a3
Change-Id: Id67ddb86c94a008f319e2179dc54172fb3463531
Adam Seaton [Tue, 17 Jan 2017 23:18:40 +0000 (23:18 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am:
6cece247c4 am:
a66bd3ad13 am:
26cd6d4d12 -s ours
am:
f5ef1d35de -s ours
Change-Id: Ibf627354b3020a6c1b028f0ae9a58393f5fce85b
Adam Seaton [Tue, 17 Jan 2017 23:18:40 +0000 (23:18 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b
am:
a37d310d61 -s ours
Change-Id: Ib0c574081b99826ec576f402f1c4e4589dda7c79
Adam Seaton [Tue, 17 Jan 2017 23:16:14 +0000 (23:16 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098
am:
cc7fef92de
Change-Id: I9966dc52a69f3ab9fe861b30dbffffe85bf18b0b
Adam Seaton [Tue, 17 Jan 2017 23:16:14 +0000 (23:16 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am:
84888652e0 -s ours am:
d438fc526d
am:
b40dc64ed2 -s ours
Change-Id: I4e4da24075fdd2f188499d88c9015a5df7f83890
Adam Seaton [Tue, 17 Jan 2017 23:16:10 +0000 (23:16 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am:
28dae4b62b -s ours am:
b0d0a4ec9b
am:
80bc7863c8 -s ours
Change-Id: Idf7249464429186c6bda1885659131f84e93f958
Adam Seaton [Tue, 17 Jan 2017 23:16:10 +0000 (23:16 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0 am:
b3048c5407
am:
039d96139b
Change-Id: Ibd1b6d1b381613d9e5bd5881d7e74b11985bd045
Adam Seaton [Tue, 17 Jan 2017 23:15:11 +0000 (23:15 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/
34345751 am:
3597d69559 am:
97c071f5ae
am:
61c5e5075c -s ours
Change-Id: I169690089a68384fe51b59633faf9034cafb8b6a
Adam Seaton [Tue, 17 Jan 2017 23:15:07 +0000 (23:15 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am:
6cece247c4 am:
a66bd3ad13
am:
26cd6d4d12 -s ours
Change-Id: Ic8bc55576191540ceeb737da7efc9990a06fa73c
Adam Seaton [Tue, 17 Jan 2017 23:14:43 +0000 (23:14 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d
am:
41f489b098
Change-Id: I8f35258670b1d60aeb1c74c48039e27be984f50a
Adam Seaton [Tue, 17 Jan 2017 23:14:40 +0000 (23:14 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0
am:
b3048c5407
Change-Id: I03bf0adaf3149f1b21abb26cf0232b846211f5e2
Adam Seaton [Tue, 17 Jan 2017 23:12:53 +0000 (23:12 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/
34345751 am:
3597d69559
am:
97c071f5ae
Change-Id: If692f8391d6efb12dab5ab99897251b89f13ecae
Adam Seaton [Tue, 17 Jan 2017 23:12:50 +0000 (23:12 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am:
6cece247c4
am:
a66bd3ad13
Change-Id: I030e27f682e8a80a02fdb841be35cf776e8af672
Adam Seaton [Tue, 17 Jan 2017 23:12:15 +0000 (23:12 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am:
84888652e0 -s ours
am:
d438fc526d
Change-Id: I4e3fd5f7566475e654fa0036dae1011019f75394
Adam Seaton [Tue, 17 Jan 2017 23:12:11 +0000 (23:12 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am:
28dae4b62b -s ours
am:
b0d0a4ec9b
Change-Id: I24ec0890fcb59e72f8ed721d8078dd021e78a60c
Adam Seaton [Tue, 17 Jan 2017 23:10:45 +0000 (23:10 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/
34345751
am:
3597d69559
Change-Id: Ie181e32f7a92bb9b42f91e3318a030c12c9dcdcb
Adam Seaton [Tue, 17 Jan 2017 23:10:42 +0000 (23:10 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev
am:
6cece247c4
Change-Id: I60ae28123b3fdbda88a94315fe14dfdffa5f7660
Adam Seaton [Tue, 17 Jan 2017 23:10:15 +0000 (23:10 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev
am:
b6ac653f2d
Change-Id: I7bd08773c1c80d37c64cff7da299abc89c77faa6