OSDN Git Service
Adam Seaton [Mon, 12 Dec 2016 18:46:00 +0000 (18:46 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804 am:
ca32812b01 -s ours am:
2e720eba5f am:
c8d8647e37 am:
8e5abe38c0 am:
78cdf4fd07 am:
af617a8560
am:
72aef1bed8
Change-Id: Ic57232ec5c653efb660fd83ee10443910dd6309d
Adam Seaton [Mon, 12 Dec 2016 18:39:30 +0000 (18:39 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804 am:
ca32812b01 -s ours am:
2e720eba5f am:
c8d8647e37 am:
8e5abe38c0 am:
78cdf4fd07
am:
af617a8560
Change-Id: I779ed1ad9c63a0c0a5dd06354eaa0090d8b5c98d
Adam Seaton [Mon, 12 Dec 2016 18:33:00 +0000 (18:33 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804 am:
ca32812b01 -s ours am:
2e720eba5f am:
c8d8647e37 am:
8e5abe38c0
am:
78cdf4fd07
Change-Id: I842e2b6e945ccf499c64739113766591fd4d64ea
Adam Seaton [Mon, 12 Dec 2016 18:27:28 +0000 (18:27 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804 am:
ca32812b01 -s ours am:
2e720eba5f am:
c8d8647e37
am:
8e5abe38c0
Change-Id: Ia8b27f37c87f72adc4d8aa88aca67adf18d8701d
Adam Seaton [Mon, 12 Dec 2016 18:21:28 +0000 (18:21 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804 am:
ca32812b01 -s ours am:
2e720eba5f
am:
c8d8647e37
Change-Id: If00880a4b61eccd7b19a5027cef8a0cfd07f9c29
Adam Seaton [Mon, 12 Dec 2016 18:14:28 +0000 (18:14 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804 am:
ca32812b01 -s ours
am:
2e720eba5f
Change-Id: I41268e0dccc8aa6cb593cd6285e760f87aa54f94
Adam Seaton [Mon, 12 Dec 2016 18:08:57 +0000 (18:08 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804
am:
ca32812b01 -s ours
Change-Id: I1442ac08228cb1aa308869590dc0a0c16f9ab192
Adam Seaton [Thu, 8 Dec 2016 19:16:48 +0000 (19:16 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87 am:
31bc4666be -s ours am:
80d094259e
am:
ab8c6b7e33
Change-Id: I08505a341bce3869628b6f09157332bf5bb0d1d5
Adam Seaton [Thu, 8 Dec 2016 19:16:40 +0000 (19:16 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7 am:
0c30223c15 -s ours am:
4758581371
am:
7ab9da0e3e
Change-Id: Icc44a43eefe8db0fcd9191b10ce6e2517ce56f99
Adam Seaton [Thu, 8 Dec 2016 19:11:15 +0000 (19:11 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87 am:
31bc4666be -s ours
am:
80d094259e
Change-Id: I90763143c525a186c503abccc6f710fb851d72b6
Adam Seaton [Thu, 8 Dec 2016 19:11:10 +0000 (19:11 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7 am:
0c30223c15 -s ours
am:
4758581371
Change-Id: Ib67b4e7043da863341e0e9d2f79a3e9fed0a7351
Adam Seaton [Thu, 8 Dec 2016 19:06:44 +0000 (19:06 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87
am:
31bc4666be -s ours
Change-Id: I0ec36bbce6a7ec254360eb3133f99813b5de5aa0
Adam Seaton [Thu, 8 Dec 2016 19:06:39 +0000 (19:06 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7
am:
0c30223c15 -s ours
Change-Id: I9a6046de21e024e5f3378047411e5270881aa2d3
Adam Seaton [Thu, 8 Dec 2016 19:02:14 +0000 (19:02 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b
am:
7a2ca27f87
Change-Id: Iafe15e8f02674cf82a933464256e0d1d14549c3f
Adam Seaton [Thu, 8 Dec 2016 19:02:09 +0000 (19:02 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c
am:
e76d1419c7
Change-Id: I376173b292e1e26c5de1147312caa94f0a531af1
Adam Seaton [Thu, 8 Dec 2016 18:57:13 +0000 (18:57 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac
am:
4e1976ff9b
Change-Id: I1e2194c66c28220d6f8d2c2b8f12e63f420dc39b
Adam Seaton [Thu, 8 Dec 2016 18:57:09 +0000 (18:57 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7
am:
6083d8337c
Change-Id: I1f2345cf0ebce7f0124cc235a4bdeee8e9c32dfc
Adam Seaton [Thu, 8 Dec 2016 18:53:13 +0000 (18:53 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev
am:
06e7d1f2ac
Change-Id: I964c1abe8c27142f30b570877681e13dd38d4aca
Adam Seaton [Thu, 8 Dec 2016 18:53:08 +0000 (18:53 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev
am:
f92880e0c7
Change-Id: Ib50d3f7d336d9e6b6f7edcac63c8927fc17aa780
Adam Seaton [Wed, 7 Dec 2016 23:53:02 +0000 (23:53 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c
am:
36d8423804
Change-Id: I20bfc381b8cc47c5568d2586e777be8123cafbcc
Adam Seaton [Wed, 7 Dec 2016 23:48:31 +0000 (23:48 +0000)]
Update Security String to 2017-02-01 in lmp-dev
am:
19717dff7c
Change-Id: I3c8bdfed5a0f11b5965f596aee216ced8573a644
Adam Seaton [Wed, 7 Dec 2016 22:58:43 +0000 (14:58 -0800)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev
Change-Id: Iefaf98b1fe24e70f1262a432b6edc792383acf8e
Adam Seaton [Wed, 7 Dec 2016 22:57:17 +0000 (14:57 -0800)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev
Change-Id: I4563c5d9176d690676402f671971e46a484cadc0
Adam Seaton [Wed, 7 Dec 2016 22:50:23 +0000 (14:50 -0800)]
Update Security String to 2017-02-01 in lmp-dev
Change-Id: I8b6c031c274781c39472ffd544b134e7d13cb78c
Marco Nelissen [Fri, 2 Dec 2016 16:53:19 +0000 (16:53 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am:
198262ff83 -s ours am:
953a9eb3d3 am:
14d24b3d5f -s ours am:
0d45d96082 am:
6f45a5f721 am:
22b2728055 am:
37d1ec0632 -s ours am:
f8dc0c9dc5
am:
c65b6de802
Change-Id: I76291a36fa5fb74d081432d97c681eafde2caefe
Marco Nelissen [Fri, 2 Dec 2016 16:53:05 +0000 (16:53 +0000)]
DO NOT MERGE increase generic_mips system partition am:
7824073a36 -s ours am:
0c041e9ada am:
29ee191947 -s ours am:
16ee67f1a7 am:
8fc84f4de0 am:
7474d313f9 am:
ac0ca8f326 -s ours am:
58c4e2e48a
am:
32711700ab
Change-Id: I0c8041004cd52112234e1ef368bf501262a6668c
Marco Nelissen [Fri, 2 Dec 2016 16:46:48 +0000 (16:46 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am:
198262ff83 -s ours am:
953a9eb3d3 am:
14d24b3d5f -s ours am:
0d45d96082 am:
6f45a5f721 am:
22b2728055 am:
37d1ec0632 -s ours
am:
f8dc0c9dc5
Change-Id: Id20a467fc9c4883437cdf22779b6d7466f1b1bcb
Marco Nelissen [Fri, 2 Dec 2016 16:46:34 +0000 (16:46 +0000)]
DO NOT MERGE increase generic_mips system partition am:
7824073a36 -s ours am:
0c041e9ada am:
29ee191947 -s ours am:
16ee67f1a7 am:
8fc84f4de0 am:
7474d313f9 am:
ac0ca8f326 -s ours
am:
58c4e2e48a
Change-Id: Iba9549d8886e7b4389dd4b9e7819e0036be27a27
Marco Nelissen [Fri, 2 Dec 2016 16:39:47 +0000 (16:39 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am:
198262ff83 -s ours am:
953a9eb3d3 am:
14d24b3d5f -s ours am:
0d45d96082 am:
6f45a5f721 am:
22b2728055
am:
37d1ec0632 -s ours
Change-Id: I428c6d48643b7237bbbf8104589c210d25eb1055
Marco Nelissen [Fri, 2 Dec 2016 16:39:32 +0000 (16:39 +0000)]
DO NOT MERGE increase generic_mips system partition am:
7824073a36 -s ours am:
0c041e9ada am:
29ee191947 -s ours am:
16ee67f1a7 am:
8fc84f4de0 am:
7474d313f9
am:
ac0ca8f326 -s ours
Change-Id: Ie648485e2ee7e77f4cb3d1908e77869aeb60b1b0
Marco Nelissen [Fri, 2 Dec 2016 16:32:19 +0000 (16:32 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am:
198262ff83 -s ours am:
953a9eb3d3 am:
14d24b3d5f -s ours am:
0d45d96082 am:
6f45a5f721
am:
22b2728055
Change-Id: I6343efb304a4f1fe2bc91991c91fdf654470a5d5
Marco Nelissen [Fri, 2 Dec 2016 16:32:04 +0000 (16:32 +0000)]
DO NOT MERGE increase generic_mips system partition am:
7824073a36 -s ours am:
0c041e9ada am:
29ee191947 -s ours am:
16ee67f1a7 am:
8fc84f4de0
am:
7474d313f9
Change-Id: I46a20b65f19a35f5acded84d69f1357cd2505cb5
Marco Nelissen [Fri, 2 Dec 2016 16:24:48 +0000 (16:24 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am:
198262ff83 -s ours am:
953a9eb3d3 am:
14d24b3d5f -s ours am:
0d45d96082
am:
6f45a5f721
Change-Id: I8dcd653967d64d937c6668f5ac96ea9b1e318e1f
Marco Nelissen [Fri, 2 Dec 2016 16:24:32 +0000 (16:24 +0000)]
DO NOT MERGE increase generic_mips system partition am:
7824073a36 -s ours am:
0c041e9ada am:
29ee191947 -s ours am:
16ee67f1a7
am:
8fc84f4de0
Change-Id: I27c7113fe9835abda40aaccab6d51f77fcfa904f
Marco Nelissen [Fri, 2 Dec 2016 16:17:49 +0000 (16:17 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am:
198262ff83 -s ours am:
953a9eb3d3 am:
14d24b3d5f -s ours
am:
0d45d96082
Change-Id: I2e344c35fe0e9ee0b54db9ba27767e933d9ab4b9
Marco Nelissen [Fri, 2 Dec 2016 16:17:32 +0000 (16:17 +0000)]
DO NOT MERGE increase generic_mips system partition am:
7824073a36 -s ours am:
0c041e9ada am:
29ee191947 -s ours
am:
16ee67f1a7
Change-Id: I0e49eb7e973eed961be9ad4906ab9973f336d53c
Marco Nelissen [Fri, 2 Dec 2016 16:10:18 +0000 (16:10 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am:
198262ff83 -s ours am:
953a9eb3d3
am:
14d24b3d5f -s ours
Change-Id: Ic1a6a4a38bb031d1cafe2a464a7376761905f785
Marco Nelissen [Fri, 2 Dec 2016 16:10:01 +0000 (16:10 +0000)]
DO NOT MERGE increase generic_mips system partition am:
7824073a36 -s ours am:
0c041e9ada
am:
29ee191947 -s ours
Change-Id: If071ac480c61b67b623127d3642948bfcf43a0de
Marco Nelissen [Fri, 2 Dec 2016 16:03:16 +0000 (16:03 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am:
198262ff83 -s ours
am:
953a9eb3d3
Change-Id: If584daaf9b59531ebc9854003164ef6d7834c931
Marco Nelissen [Fri, 2 Dec 2016 16:03:01 +0000 (16:03 +0000)]
DO NOT MERGE increase generic_mips system partition am:
7824073a36 -s ours
am:
0c041e9ada
Change-Id: I2e774bf919520af01ba19f570c5d97bc8d6c85b0
Marco Nelissen [Fri, 2 Dec 2016 15:55:31 +0000 (15:55 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev
am:
198262ff83 -s ours
Change-Id: I0a336fa847df3c1375e1263e50723f08635d531f
Marco Nelissen [Fri, 2 Dec 2016 15:55:30 +0000 (15:55 +0000)]
DO NOT MERGE increase generic_mips system partition
am:
7824073a36 -s ours
Change-Id: I1b60e3cfc39735edfdcc48b215d53e7dac5aa207
Marco Nelissen [Fri, 2 Dec 2016 15:45:17 +0000 (15:45 +0000)]
Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev
Tao Bao [Wed, 30 Nov 2016 20:11:57 +0000 (12:11 -0800)]
Build recovery-two-step.img for two-step OTAs.
In two-step OTAs, we write recovery image to /boot as the first step so
that we can reboot from there and install a new recovery image to
/recovery. However, bootloader will show "Your device is corrupt"
message when booting /boot with the recovery image. Because the recovery
image encodes the path of "/recovery" as part of the signature metadata,
which fails the verified boot.
This CL generates a special "recovery-two-step.img" in addition to the
regular recovery.img. This image encodes "/boot" when being signed,
which will be flashed to /boot at stage 1/3 in a two-step OTA.
Here are the desired changes:
- 'IMAGES/recovery-two-step.img' exists in target_files.zip for non-A/B
targets (e.g. bullhead). The image should not exist for targets that
don't have a recovery partition (e.g. A/B devices like sailfish).
- <device>-img.zip should not contain 'recovery-two-step.img'.
- Nothing should change when building non-two-step OTAs. For two-step
OTAs, 'recovery-two-step.img' should be included in the OTA package;
'updater-script' should flash this image to /boot at stage 1/3.
- When building a two-step OTA with an input TF.zip that doesn't have
IMAGES/recovery-two-step.img, it should use the existing
IMAGES/recovery.img instead.
Bug:
32986477
Test: Tested the steps above on bullhead and sailfish.
Change-Id: I34e6c599bcf2011d4cd5c926999418b3975d6d0f
(cherry picked from commit
d42e97ebb45fdc5a30799a3f37e482948d318010)
Marco Nelissen [Wed, 30 Nov 2016 21:14:13 +0000 (13:14 -0800)]
DO NOT MERGE increase generic_mips system partition
Increase system partition from 750MB to 768MB to fix
sdk_google_phone_mips build.
Change-Id: I35a60767a3dea7b1ce3c97246f4a038c98f5cb06
Tao Bao [Tue, 29 Nov 2016 00:19:36 +0000 (00:19 +0000)]
Makefile: Pack verity_verifier into otatools.zip. am:
7bb3aff71c
am:
ad8924117d
Change-Id: Ia766ef6038434d8435a81f7e921de2936fd33411
Tao Bao [Tue, 29 Nov 2016 00:15:05 +0000 (00:15 +0000)]
Makefile: Pack verity_verifier into otatools.zip.
am:
7bb3aff71c
Change-Id: Iffb447dea7f4b227edf5311229ea0902bb4b25f5
Tao Bao [Sat, 19 Nov 2016 01:04:24 +0000 (17:04 -0800)]
Makefile: Pack verity_verifier into otatools.zip.
verity_verifier is needed when verifying verity metadata.
Bug:
32173582
Test: `m otatools-package`
Change-Id: I63fdeb75cdca10ea38c1df978d64701acdd4c1db
(cherry picked from commit
7f02f3413b8cd2e6b5cfda3883b2783ab819558b)
Adam Seaton [Thu, 17 Nov 2016 19:42:32 +0000 (19:42 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev am:
1a242b67fe am:
27ac4ac1da am:
ac64c64f9a am:
618f64d183 am:
d635edfd04 am:
6f0c3f4bdc am:
c5ecbe4047 am:
4a45d769e9
am:
e033ae9cff
Change-Id: I5e382f4500c675d4ff7e57ce0edf94b2dbf1e9ce
Adam Seaton [Thu, 17 Nov 2016 19:42:25 +0000 (19:42 +0000)]
Updating Security String to 2017-01-05 am:
26250019df am:
6a9981128d am:
1691e69497 -s ours am:
4d3fa3f47e am:
26f54a9c9d am:
1685901f54 am:
de90bd9c11 am:
373d596d29
am:
d4318b4dd8
Change-Id: Ice239eb8dff884b330c68d99065b99ed013bf324
Adam Seaton [Thu, 17 Nov 2016 19:42:18 +0000 (19:42 +0000)]
Updating Security String to 2017-01-01 am:
a0985a838b am:
542e90b0be am:
99abf297d8 -s ours am:
8316b162d9 am:
3d6c04a185 am:
954e945541 am:
00e57d1e7d am:
69324d3272
am:
aca891ceb7
Change-Id: Ief475655c01f73766949ecae0b0e56fc0f84cd18
Adam Seaton [Thu, 17 Nov 2016 19:34:32 +0000 (19:34 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev am:
1a242b67fe am:
27ac4ac1da am:
ac64c64f9a am:
618f64d183 am:
d635edfd04 am:
6f0c3f4bdc am:
c5ecbe4047
am:
4a45d769e9
Change-Id: I4be9db9c0a6554c89e757220b115f2af22631964
Adam Seaton [Thu, 17 Nov 2016 19:34:26 +0000 (19:34 +0000)]
Updating Security String to 2017-01-05 am:
26250019df am:
6a9981128d am:
1691e69497 -s ours am:
4d3fa3f47e am:
26f54a9c9d am:
1685901f54 am:
de90bd9c11
am:
373d596d29
Change-Id: Id74ddab87bc958c23891c499e311fbeae5844171
Adam Seaton [Thu, 17 Nov 2016 19:34:19 +0000 (19:34 +0000)]
Updating Security String to 2017-01-01 am:
a0985a838b am:
542e90b0be am:
99abf297d8 -s ours am:
8316b162d9 am:
3d6c04a185 am:
954e945541 am:
00e57d1e7d
am:
69324d3272
Change-Id: I1c1f7c40909b0000fdb505491152dbada43bc1f9
Adam Seaton [Thu, 17 Nov 2016 19:27:29 +0000 (19:27 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev am:
1a242b67fe am:
27ac4ac1da am:
ac64c64f9a am:
618f64d183 am:
d635edfd04 am:
6f0c3f4bdc
am:
c5ecbe4047
Change-Id: Id66af0612e1c29d234801e8b1a3f2fa90ba58643
Adam Seaton [Thu, 17 Nov 2016 19:27:23 +0000 (19:27 +0000)]
Updating Security String to 2017-01-05 am:
26250019df am:
6a9981128d am:
1691e69497 -s ours am:
4d3fa3f47e am:
26f54a9c9d am:
1685901f54
am:
de90bd9c11
Change-Id: I8e628479bba5e7078c792ffb239957eb9c655a84
Adam Seaton [Thu, 17 Nov 2016 19:27:17 +0000 (19:27 +0000)]
Updating Security String to 2017-01-01 am:
a0985a838b am:
542e90b0be am:
99abf297d8 -s ours am:
8316b162d9 am:
3d6c04a185 am:
954e945541
am:
00e57d1e7d
Change-Id: I3dd1b9cb2c3cdb8c67680f813d2a7de7fb244da9
Adam Seaton [Thu, 17 Nov 2016 19:19:58 +0000 (19:19 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev am:
1a242b67fe am:
27ac4ac1da am:
ac64c64f9a am:
618f64d183 am:
d635edfd04
am:
6f0c3f4bdc
Change-Id: I85587a1eccc80443efb76853ec70ea339e422481
Adam Seaton [Thu, 17 Nov 2016 19:19:51 +0000 (19:19 +0000)]
Updating Security String to 2017-01-05 am:
26250019df am:
6a9981128d am:
1691e69497 -s ours am:
4d3fa3f47e am:
26f54a9c9d
am:
1685901f54
Change-Id: I66d237a4e44a97297f95b2ba24d761dbc70b29c7
Adam Seaton [Thu, 17 Nov 2016 19:19:46 +0000 (19:19 +0000)]
Updating Security String to 2017-01-01 am:
a0985a838b am:
542e90b0be am:
99abf297d8 -s ours am:
8316b162d9 am:
3d6c04a185
am:
954e945541
Change-Id: I8e52d83745ef061bf8b372086fcdaa6d64a9211c
Adam Seaton [Thu, 17 Nov 2016 19:12:27 +0000 (19:12 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev am:
1a242b67fe am:
27ac4ac1da am:
ac64c64f9a am:
618f64d183
am:
d635edfd04
Change-Id: I89bbff14776bbdec62f465342818f95cf38a5b80
Adam Seaton [Thu, 17 Nov 2016 19:12:23 +0000 (19:12 +0000)]
Updating Security String to 2017-01-05 am:
26250019df am:
6a9981128d am:
1691e69497 -s ours am:
4d3fa3f47e
am:
26f54a9c9d
Change-Id: I1fb4a8e558b2849c7104003d852d7e5577be66ed
Adam Seaton [Thu, 17 Nov 2016 19:12:18 +0000 (19:12 +0000)]
Updating Security String to 2017-01-01 am:
a0985a838b am:
542e90b0be am:
99abf297d8 -s ours am:
8316b162d9
am:
3d6c04a185
Change-Id: Id60b5b3182dfa8328767853a516959705a282dc0
Adam Seaton [Thu, 17 Nov 2016 19:05:27 +0000 (19:05 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev am:
1a242b67fe am:
27ac4ac1da am:
ac64c64f9a
am:
618f64d183
Change-Id: I5e8593a648f5a5be6426e716f0f11f95a948abff
Adam Seaton [Thu, 17 Nov 2016 19:05:21 +0000 (19:05 +0000)]
Updating Security String to 2017-01-05 am:
26250019df am:
6a9981128d am:
1691e69497 -s ours
am:
4d3fa3f47e
Change-Id: I47fa23d0756c00749a63c778b589cd9f168ff16b
Adam Seaton [Thu, 17 Nov 2016 19:05:16 +0000 (19:05 +0000)]
Updating Security String to 2017-01-01 am:
a0985a838b am:
542e90b0be am:
99abf297d8 -s ours
am:
8316b162d9
Change-Id: I74277f546f9bb945df45472181f87e7c503b0799
Adam Seaton [Thu, 17 Nov 2016 18:57:26 +0000 (18:57 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev am:
1a242b67fe am:
27ac4ac1da
am:
ac64c64f9a
Change-Id: I065c4413434b01bbe13dc25437f5c45dade7acdb
Adam Seaton [Thu, 17 Nov 2016 18:57:21 +0000 (18:57 +0000)]
Updating Security String to 2017-01-05 am:
26250019df am:
6a9981128d
am:
1691e69497 -s ours
Change-Id: Ia8212c5397b14473bfa8916b96d9365f34818229
Adam Seaton [Thu, 17 Nov 2016 18:57:16 +0000 (18:57 +0000)]
Updating Security String to 2017-01-01 am:
a0985a838b am:
542e90b0be
am:
99abf297d8 -s ours
Change-Id: Ib9fc62c50d1d3d07fa0ad03dd93a8c88e10d5c3c
Adam Seaton [Thu, 17 Nov 2016 18:18:50 +0000 (18:18 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev am:
1a242b67fe
am:
27ac4ac1da
Change-Id: Iee18a297b1c52c6c149846670b0e73cf5a23a53c
Adam Seaton [Thu, 17 Nov 2016 18:18:45 +0000 (18:18 +0000)]
Updating Security String to 2017-01-05 am:
26250019df
am:
6a9981128d
Change-Id: I99d0bef8d06bd350fdacdc425da61cf9169f963f
Adam Seaton [Thu, 17 Nov 2016 18:18:41 +0000 (18:18 +0000)]
Updating Security String to 2017-01-01 am:
a0985a838b
am:
542e90b0be
Change-Id: I8cb08c9722b7aea116cd93b6cabea2200b05bbd3
Adam Seaton [Thu, 17 Nov 2016 18:10:46 +0000 (18:10 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev
am:
1a242b67fe
Change-Id: Ifd69049e1e2d055eb99c3c40c3ca66b5500d5a1e
Adam Seaton [Thu, 17 Nov 2016 18:10:45 +0000 (18:10 +0000)]
Updating Security String to 2017-01-05
am:
26250019df
Change-Id: I35aca489641d9df526ebc153afb4dbccff2b5975
Adam Seaton [Thu, 17 Nov 2016 18:10:41 +0000 (18:10 +0000)]
Updating Security String to 2017-01-01
am:
a0985a838b
Change-Id: I09a8034abb2d691527207947928e61326b80eb04
Adam Seaton [Thu, 17 Nov 2016 18:04:32 +0000 (18:04 +0000)]
Merge changes I30f397b0,I717a6f03 into lmp-dev
* changes:
Updating Security String to 2017-01-05
Updating Security String to 2017-01-01
Adam Seaton [Thu, 17 Nov 2016 00:56:52 +0000 (00:56 +0000)]
Update Security String to 2017-01-05 in klp-dev am:
4f483f18e7 am:
b2cc64fdd5 am:
3fa1b8a55e -s ours am:
7fa6402d8e am:
70849c073b am:
85e8b1c54f am:
a0e047834c am:
e515169acc am:
925cdbcc44 am:
3b6d4247d4 am:
fc9a3a6289
am:
e6228c3c29
Change-Id: If1e0660b8615b488d0b3a16ca0258570840dd63e
Adam Seaton [Thu, 17 Nov 2016 00:56:41 +0000 (00:56 +0000)]
Update Security string to 2017-01-01 in klp-dev am:
21f5d281f3 am:
0f344dd00a am:
a50e96923c -s ours am:
6a89a1936f am:
2652d28bea am:
a8cedadbf9 am:
f1372e43e5 am:
27202c78b9 am:
0ab37afc51 am:
23654fcee6 am:
49ab1b9aec
am:
4066fd01b1
Change-Id: I0233fbe50be4f6b9e552e840fc8892a89a2dfadf
Adam Seaton [Thu, 17 Nov 2016 00:50:16 +0000 (00:50 +0000)]
Update Security String to 2017-01-05 in klp-dev am:
4f483f18e7 am:
b2cc64fdd5 am:
3fa1b8a55e -s ours am:
7fa6402d8e am:
70849c073b am:
85e8b1c54f am:
a0e047834c am:
e515169acc am:
925cdbcc44 am:
3b6d4247d4
am:
fc9a3a6289
Change-Id: Ia6f2eb896ab071bdb3f5310d99062aa49e17231e
Adam Seaton [Thu, 17 Nov 2016 00:50:09 +0000 (00:50 +0000)]
Update Security string to 2017-01-01 in klp-dev am:
21f5d281f3 am:
0f344dd00a am:
a50e96923c -s ours am:
6a89a1936f am:
2652d28bea am:
a8cedadbf9 am:
f1372e43e5 am:
27202c78b9 am:
0ab37afc51 am:
23654fcee6
am:
49ab1b9aec
Change-Id: I9cdc0480795051c789a5c3ab9e4ff3fd18475c03
Adam Seaton [Thu, 17 Nov 2016 00:43:14 +0000 (00:43 +0000)]
Update Security String to 2017-01-05 in klp-dev am:
4f483f18e7 am:
b2cc64fdd5 am:
3fa1b8a55e -s ours am:
7fa6402d8e am:
70849c073b am:
85e8b1c54f am:
a0e047834c am:
e515169acc am:
925cdbcc44
am:
3b6d4247d4
Change-Id: I020c834b0fcb8b729daf0c2993690b940268f8d9
Adam Seaton [Thu, 17 Nov 2016 00:43:08 +0000 (00:43 +0000)]
Update Security string to 2017-01-01 in klp-dev am:
21f5d281f3 am:
0f344dd00a am:
a50e96923c -s ours am:
6a89a1936f am:
2652d28bea am:
a8cedadbf9 am:
f1372e43e5 am:
27202c78b9 am:
0ab37afc51
am:
23654fcee6
Change-Id: Ie8d8097a03381c800c29c0fc05cddce72921d163
Adam Seaton [Thu, 17 Nov 2016 00:36:15 +0000 (00:36 +0000)]
Update Security String to 2017-01-05 in klp-dev am:
4f483f18e7 am:
b2cc64fdd5 am:
3fa1b8a55e -s ours am:
7fa6402d8e am:
70849c073b am:
85e8b1c54f am:
a0e047834c am:
e515169acc
am:
925cdbcc44
Change-Id: Icfbcaebebae118d96824a6bc15e85f4351a22277
Adam Seaton [Thu, 17 Nov 2016 00:36:15 +0000 (00:36 +0000)]
Updating Security String to 2017-01-05 on mnc-dev am:
5e46dc2215 am:
f57eb8ce2d am:
b81dff49dc am:
b25cb027ea -s ours am:
d74f26b3bf
am:
54bfae5f11
Change-Id: Ifcc2bf99edd65798d5b663102502c7dee8ae0b02
Adam Seaton [Thu, 17 Nov 2016 00:36:08 +0000 (00:36 +0000)]
Update Security string to 2017-01-01 in klp-dev am:
21f5d281f3 am:
0f344dd00a am:
a50e96923c -s ours am:
6a89a1936f am:
2652d28bea am:
a8cedadbf9 am:
f1372e43e5 am:
27202c78b9
am:
0ab37afc51
Change-Id: Ic44d26c555f0290a3260244c0d24a673ffeab823
Adam Seaton [Thu, 17 Nov 2016 00:36:08 +0000 (00:36 +0000)]
Updating Security string to 2017-01-01 on mnc-dev am:
7224901e6b am:
5b54c86fb7 am:
0ca9715ced am:
1512b79479 -s ours am:
6eb9073057
am:
25d73fa79b
Change-Id: Id6fdcf14df3803273870f7acfbccf8f2f93ec143
Adam Seaton [Thu, 17 Nov 2016 00:29:14 +0000 (00:29 +0000)]
Update Security String to 2017-01-05 in klp-dev am:
4f483f18e7 am:
b2cc64fdd5 am:
3fa1b8a55e -s ours am:
7fa6402d8e am:
70849c073b am:
85e8b1c54f am:
a0e047834c
am:
e515169acc
Change-Id: I1d9a2f654b346ec3ea8e666c5fb133cd8a87ccf3
Adam Seaton [Thu, 17 Nov 2016 00:29:12 +0000 (00:29 +0000)]
Updating Security String to 2017-01-05 on mnc-dev am:
5e46dc2215 am:
f57eb8ce2d am:
b81dff49dc am:
b25cb027ea -s ours
am:
d74f26b3bf
Change-Id: I404e2c9419c836c18b24b0348f98c151d17cdb5b
Adam Seaton [Thu, 17 Nov 2016 00:29:07 +0000 (00:29 +0000)]
Update Security string to 2017-01-01 in klp-dev am:
21f5d281f3 am:
0f344dd00a am:
a50e96923c -s ours am:
6a89a1936f am:
2652d28bea am:
a8cedadbf9 am:
f1372e43e5
am:
27202c78b9
Change-Id: If5c5a368300038a60a6adc5199407c4e45992aa6
Adam Seaton [Thu, 17 Nov 2016 00:29:07 +0000 (00:29 +0000)]
Updating Security string to 2017-01-01 on mnc-dev am:
7224901e6b am:
5b54c86fb7 am:
0ca9715ced am:
1512b79479 -s ours
am:
6eb9073057
Change-Id: I971d329998f535492685a730adaf055ea6a5b2d7
Adam Seaton [Thu, 17 Nov 2016 00:22:12 +0000 (00:22 +0000)]
Update Security String to 2017-01-05 in klp-dev am:
4f483f18e7 am:
b2cc64fdd5 am:
3fa1b8a55e -s ours am:
7fa6402d8e am:
70849c073b am:
85e8b1c54f
am:
a0e047834c
Change-Id: If8e3d7efa6a5f77da091ce527cf05cbfee6d726c
Adam Seaton [Thu, 17 Nov 2016 00:22:12 +0000 (00:22 +0000)]
Updating Security String to 2017-01-05 on mnc-dev am:
5e46dc2215 am:
f57eb8ce2d am:
b81dff49dc
am:
b25cb027ea -s ours
Change-Id: I736f2af6d3df2ad475da3cfe8d262034e940c74b
Adam Seaton [Thu, 17 Nov 2016 00:22:07 +0000 (00:22 +0000)]
Update Security string to 2017-01-01 in klp-dev am:
21f5d281f3 am:
0f344dd00a am:
a50e96923c -s ours am:
6a89a1936f am:
2652d28bea am:
a8cedadbf9
am:
f1372e43e5
Change-Id: I5926ddb78d1f485e00328f77c165baf5fdd9c20d
Adam Seaton [Thu, 17 Nov 2016 00:22:07 +0000 (00:22 +0000)]
Updating Security string to 2017-01-01 on mnc-dev am:
7224901e6b am:
5b54c86fb7 am:
0ca9715ced
am:
1512b79479 -s ours
Change-Id: I56c5a558499dc459bb3cf6e26d18b69161ac921b
Adam Seaton [Thu, 17 Nov 2016 00:15:11 +0000 (00:15 +0000)]
Update Security String to 2017-01-05 in klp-dev am:
4f483f18e7 am:
b2cc64fdd5 am:
3fa1b8a55e -s ours am:
7fa6402d8e am:
70849c073b
am:
85e8b1c54f
Change-Id: Iaad3f09f11a8cdb9ce761f7e00fa52e9bd715e63
Adam Seaton [Thu, 17 Nov 2016 00:15:06 +0000 (00:15 +0000)]
Update Security string to 2017-01-01 in klp-dev am:
21f5d281f3 am:
0f344dd00a am:
a50e96923c -s ours am:
6a89a1936f am:
2652d28bea
am:
a8cedadbf9
Change-Id: Icee9f00c79d481c40c08c5f8bdade95341701a3a
Adam Seaton [Thu, 17 Nov 2016 00:08:10 +0000 (00:08 +0000)]
Update Security String to 2017-01-05 in klp-dev am:
4f483f18e7 am:
b2cc64fdd5 am:
3fa1b8a55e -s ours am:
7fa6402d8e
am:
70849c073b
Change-Id: Id698906faf6639d1193e9a22baff68ddb121a948
Adam Seaton [Thu, 17 Nov 2016 00:08:06 +0000 (00:08 +0000)]
Update Security string to 2017-01-01 in klp-dev am:
21f5d281f3 am:
0f344dd00a am:
a50e96923c -s ours am:
6a89a1936f
am:
2652d28bea
Change-Id: I7e326cfdcf00858691d817c25062c51a7f19800a
Adam Seaton [Thu, 17 Nov 2016 00:00:40 +0000 (00:00 +0000)]
Update Security String to 2017-01-05 in klp-dev am:
4f483f18e7 am:
b2cc64fdd5 am:
3fa1b8a55e -s ours
am:
7fa6402d8e
Change-Id: I801e3e5f409687fcf9adad26c80cb2d12d64b892
Adam Seaton [Thu, 17 Nov 2016 00:00:40 +0000 (00:00 +0000)]
Updating Security String to 2017-01-05 on nyc-dev am:
190129bc61
am:
b9085822a5
Change-Id: I8230fa0c0c13b89274bab56a04b183e4c8b0ebe7
OSDN Git Service
