OSDN Git Service
Adam Seaton [Tue, 17 Jan 2017 23:38:43 +0000 (23:38 +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 am:
04418ff1d7 am:
a3e343bff5 am:
320061f5f1 am:
fd459b20de am:
58488c7d70
am:
1faffbb28e -s ours
Change-Id: Ie7fd1d14d50e2854aeba036c4d278f673287bf1a
Adam Seaton [Tue, 17 Jan 2017 23:38:20 +0000 (23:38 +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 am:
83731b0a4d am:
5467ba8cd1 am:
797e24cf9b am:
85b71b92b5 am:
f3e0efb74c
am:
8aef5ef139 -s ours
Change-Id: I125aaca4ad398132c558225057c6a813589d1095
Adam Seaton [Tue, 17 Jan 2017 23:38:13 +0000 (23:38 +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 am:
04418ff1d7 am:
a3e343bff5 am:
320061f5f1 am:
fd459b20de am:
a7f711dc1f
am:
08533a2cd4 -s ours
Change-Id: I24aa0f6a9a65b6e05e7cc5044686993a820157a8
Adam Seaton [Tue, 17 Jan 2017 23:35:51 +0000 (23:35 +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 am:
83731b0a4d am:
5467ba8cd1 am:
797e24cf9b am:
85b71b92b5
am:
f3e0efb74c
Change-Id: I24fc36c6ff78b01cf81aa048290428966eba87a9
Adam Seaton [Tue, 17 Jan 2017 23:35:50 +0000 (23:35 +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 am:
83731b0a4d am:
5467ba8cd1 am:
797e24cf9b -s ours am:
31d3dd1f1a -s ours
am:
17f6129c84 -s ours
Change-Id: Ie9ad8e4ea99261743c41303e056bf2fc60a19ba8
Adam Seaton [Tue, 17 Jan 2017 23:35:43 +0000 (23:35 +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 am:
04418ff1d7 am:
a3e343bff5 am:
320061f5f1 am:
fd459b20de
am:
58488c7d70
Change-Id: I58244342dd55fa52973d8bd5021c8d5de87e4fc5
Adam Seaton [Tue, 17 Jan 2017 23:35:43 +0000 (23:35 +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 am:
04418ff1d7 am:
a3e343bff5 am:
320061f5f1 am:
fd459b20de
am:
a7f711dc1f
Change-Id: I2c883f18092310e87015b8f5665661b7398a5f18
Adam Seaton [Tue, 17 Jan 2017 23:35:43 +0000 (23:35 +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 am:
04418ff1d7 am:
a3e343bff5 am:
320061f5f1 -s ours am:
1ad4cfcca1 -s ours
am:
7b57d7565a -s ours
Change-Id: Ifbd2f539a1c2c34b254b35f733cb088386283bbb
Adam Seaton [Tue, 17 Jan 2017 23:33:49 +0000 (23:33 +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 am:
83731b0a4d am:
5467ba8cd1 am:
797e24cf9b
am:
85b71b92b5
Change-Id: I999c636afbc64d3014db724179e74dd77d892780
Adam Seaton [Tue, 17 Jan 2017 23:33:47 +0000 (23:33 +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 am:
83731b0a4d am:
5467ba8cd1 am:
797e24cf9b -s ours
am:
31d3dd1f1a -s ours
Change-Id: If953535873c3dcde4369a3e00937664e33eb0d81
Adam Seaton [Tue, 17 Jan 2017 23:33:42 +0000 (23:33 +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 am:
04418ff1d7 am:
a3e343bff5 am:
320061f5f1
am:
fd459b20de
Change-Id: I6e955b317ef9a0803bfc1fbd124e6e6ca64eefa4
Adam Seaton [Tue, 17 Jan 2017 23:33:42 +0000 (23:33 +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 am:
04418ff1d7 am:
a3e343bff5 am:
320061f5f1
am:
fd459b20de
Change-Id: I891f8c6cfe6bed1ff6aa9907a07b8b1d07719a97
Adam Seaton [Tue, 17 Jan 2017 23:33:41 +0000 (23:33 +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 am:
04418ff1d7 am:
a3e343bff5 am:
320061f5f1 -s ours
am:
1ad4cfcca1 -s ours
Change-Id: I8986943793e5f94ee72990ce3c097d701a93165b
Adam Seaton [Tue, 17 Jan 2017 23:31:56 +0000 (23:31 +0000)]
Merge changes from topic 'am-
9f9d40fcc7ff4201b2e6e3c9473f45a9' into nyc-mr2-dev-plus-aosp
am:
fc1d64f170
Change-Id: I731720722ad3193fdd565a73d5a865f6c619854a
Adam Seaton [Tue, 17 Jan 2017 23:31:53 +0000 (23:31 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098 am:
cc7fef92de am:
bc83db626c -s ours am:
96ec99b33a am:
7b5b22f71e am:
f2da174999 am:
543c171c07 am:
d64b7a3366
am:
b7f6f4b912 -s ours
Change-Id: Ic2fdc68e62837efdbc8ffebf851f9ac7d2beb273
Adam Seaton [Tue, 17 Jan 2017 23:31:43 +0000 (23:31 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b am:
a37d310d61 -s ours am:
efe40b59c9 am:
0bda876342 am:
9a6c74e74d am:
f3804904a0 am:
f5d39d139a
am:
9a1a27f907 -s ours
Change-Id: I88f07b51b36773e8197a858c898a13a5349ab4d5
Adam Seaton [Tue, 17 Jan 2017 23:31:19 +0000 (23:31 +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 am:
83731b0a4d am:
5467ba8cd1
am:
797e24cf9b
Change-Id: I63e53f1edae0d8a7ed9311992a6cdbe9d5ffa903
Adam Seaton [Tue, 17 Jan 2017 23:31:19 +0000 (23:31 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098 am:
cc7fef92de am:
bc83db626c -s ours am:
96ec99b33a am:
7b5b22f71e am:
f2da174999 am:
543c171c07 am:
d82982aaf4
am:
59745d99a6 -s ours
Change-Id: I8a7e8c6a7d5bee10651afa9ffb55cca7399a613c
Adam Seaton [Tue, 17 Jan 2017 23:31:18 +0000 (23:31 +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 am:
83731b0a4d am:
5467ba8cd1
am:
797e24cf9b -s ours
Change-Id: I50ffcaab1ae2b4d9323cfa59ec4415609e83cb92
Adam Seaton [Tue, 17 Jan 2017 23:31:13 +0000 (23:31 +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 am:
04418ff1d7 am:
a3e343bff5
am:
320061f5f1
Change-Id: I03a37713db8822a166c93bb86679272385fee8a9
Adam Seaton [Tue, 17 Jan 2017 23:31:12 +0000 (23:31 +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 am:
04418ff1d7 am:
a3e343bff5
am:
320061f5f1 -s ours
Change-Id: Icaca1b7f788bbbdb883c1833c565d130d1bb042a
Adam Seaton [Tue, 17 Jan 2017 23:31:12 +0000 (23:31 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b am:
a37d310d61 -s ours am:
efe40b59c9 am:
0bda876342 am:
9a6c74e74d am:
f3804904a0 am:
69625c7fca
am:
6207346b8e -s ours
Change-Id: Iae9d32400ddab44558447bca525293431322283a
Android Build Merger (Role) [Tue, 17 Jan 2017 23:29:33 +0000 (23:29 +0000)]
Merge changes from topic 'am-
9f9d40fcc7ff4201b2e6e3c9473f45a9' into nyc-mr2-dev-plus-aosp
* changes:
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098 am:
cc7fef92de am:
bc83db626c -s ours am:
96ec99b33a am:
7b5b22f71e am:
f2da174999 am:
543c171c07 am:
d64b7a3366
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b am:
a37d310d61 -s ours am:
efe40b59c9 am:
0bda876342 am:
9a6c74e74d am:
f3804904a0 am:
f5d39d139a
Adam Seaton [Tue, 17 Jan 2017 23:29:19 +0000 (23:29 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098 am:
cc7fef92de am:
bc83db626c -s ours am:
96ec99b33a am:
7b5b22f71e am:
f2da174999 am:
543c171c07
am:
d64b7a3366
Change-Id: Ibf076c8904650a445d565f545412304d653620e9
Adam Seaton [Tue, 17 Jan 2017 23:29:19 +0000 (23:29 +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 am:
83731b0a4d
am:
5467ba8cd1
Change-Id: Idca82ca69bb37d9fa1e48bd9671332beaeb6bf37
Adam Seaton [Tue, 17 Jan 2017 23:29:19 +0000 (23:29 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098 am:
cc7fef92de am:
bc83db626c -s ours am:
96ec99b33a am:
7b5b22f71e am:
f2da174999 -s ours am:
d8c259769c -s ours
am:
5fba2406b2 -s ours
Change-Id: I193bb0813d332f08ec41d3f44f2d4fd8bdd3ee70
Adam Seaton [Tue, 17 Jan 2017 23:29:18 +0000 (23:29 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098 am:
cc7fef92de am:
bc83db626c -s ours am:
96ec99b33a am:
7b5b22f71e am:
f2da174999 am:
543c171c07
am:
d82982aaf4
Change-Id: Iaefc25d1f1ebd85383973abbaaab9c2247550d12
Adam Seaton [Tue, 17 Jan 2017 23:29:13 +0000 (23:29 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b am:
a37d310d61 -s ours am:
efe40b59c9 am:
0bda876342 am:
9a6c74e74d am:
f3804904a0
am:
f5d39d139a
Change-Id: I43f3703d0a0b5fcc8a6e5a6ae8bc943b88af1a95
Adam Seaton [Tue, 17 Jan 2017 23:29:13 +0000 (23:29 +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 am:
04418ff1d7
am:
a3e343bff5
Change-Id: I315beda1d66107e5cf6e7b4ae8ee3dcfc994b5c1
Adam Seaton [Tue, 17 Jan 2017 23:29:13 +0000 (23:29 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b am:
a37d310d61 -s ours am:
efe40b59c9 am:
0bda876342 am:
9a6c74e74d -s ours am:
fb615a422c -s ours
am:
5c8c344f4c -s ours
Change-Id: I270b94d0505add72a4419ed569f43a243d740cfa
Adam Seaton [Tue, 17 Jan 2017 23:29:12 +0000 (23:29 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b am:
a37d310d61 -s ours am:
efe40b59c9 am:
0bda876342 am:
9a6c74e74d am:
f3804904a0
am:
69625c7fca
Change-Id: Ia14b84ca3e2413564b96785695967f13ee02c85d
Adam Seaton [Tue, 17 Jan 2017 23:27:18 +0000 (23:27 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098 am:
cc7fef92de am:
bc83db626c -s ours am:
96ec99b33a am:
7b5b22f71e am:
f2da174999
am:
543c171c07
Change-Id: If9a46eae1e121d5c8d80c1a4a269968c0e1e7460
Adam Seaton [Tue, 17 Jan 2017 23:27:18 +0000 (23:27 +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
am:
83731b0a4d
Change-Id: I99cb2970cefcc91a1412a7aec7fd8da2aa90e1d2
Adam Seaton [Tue, 17 Jan 2017 23:27:17 +0000 (23:27 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098 am:
cc7fef92de am:
bc83db626c -s ours am:
96ec99b33a am:
7b5b22f71e am:
f2da174999
am:
543c171c07
Change-Id: Idcc83b5c76cb2462b0ba6b45a8b51b664522dd08
Adam Seaton [Tue, 17 Jan 2017 23:27:16 +0000 (23:27 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098 am:
cc7fef92de am:
bc83db626c -s ours am:
96ec99b33a am:
7b5b22f71e am:
f2da174999 -s ours
am:
d8c259769c -s ours
Change-Id: I5a80abac937efa9c5be93755fffc737b905cbce5
Adam Seaton [Tue, 17 Jan 2017 23:27:11 +0000 (23:27 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b am:
a37d310d61 -s ours am:
efe40b59c9 am:
0bda876342 am:
9a6c74e74d
am:
f3804904a0
Change-Id: I5966b3e24466c5dc51d6e94830f0444af0e6529e
Adam Seaton [Tue, 17 Jan 2017 23:27:11 +0000 (23:27 +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
am:
04418ff1d7
Change-Id: I795a9b9788037159223de543e69cc9afcc14d94f
Adam Seaton [Tue, 17 Jan 2017 23:27:11 +0000 (23:27 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b am:
a37d310d61 -s ours am:
efe40b59c9 am:
0bda876342 am:
9a6c74e74d
am:
f3804904a0
Change-Id: Id5412c138fccbf26ac05eb28f20a56cf4e3f1580
Adam Seaton [Tue, 17 Jan 2017 23:27:10 +0000 (23:27 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b am:
a37d310d61 -s ours am:
efe40b59c9 am:
0bda876342 am:
9a6c74e74d -s ours
am:
fb615a422c -s ours
Change-Id: Ie6ea77e5614c7f73dafff0743a7072ef98c536c8
Adam Seaton [Tue, 17 Jan 2017 23:25:50 +0000 (23:25 +0000)]
Merge changes from topic 'am-
0c051b7e613446579b7d3dd1c98adbb7' into nyc-mr2-dev-plus-aosp
am:
42d4e2eb6e
Change-Id: I3505871c2ddabb2ffc3d4e98d496775e64097203
Adam Seaton [Tue, 17 Jan 2017 23:25:48 +0000 (23:25 +0000)]
Updating Security String to 2017-03-05 on nyc-dev am:
25b39b12ba am:
cb8fef9d91 am:
8e89e568b9 am:
8e90b1da24 am:
72e3501bd4
am:
808dc7cb02
Change-Id: I84770b7fcf6e28dc508a6ad8cf79ed4f68ecfe35
Adam Seaton [Tue, 17 Jan 2017 23:25:40 +0000 (23:25 +0000)]
Updating Security String to 2017-03-01 on nyc-dev am:
003e5aad03 am:
cacce5db57 am:
54b11f5c49 am:
9bbbf746ec am:
5ac65adf12
am:
5354eae585
Change-Id: I4139b208d8daea00b4906877887d5956d4815a49
Adam Seaton [Tue, 17 Jan 2017 23:25:19 +0000 (23:25 +0000)]
Updating Security String to 2017-03-05 on nyc-dev am:
25b39b12ba am:
cb8fef9d91 am:
8e89e568b9 am:
8e90b1da24 am:
9dc5de2366
am:
59d758b7e3
Change-Id: Ifbd381234baeb598612a5e104bbfa6e06633774a
Adam Seaton [Tue, 17 Jan 2017 23:25:15 +0000 (23:25 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098 am:
cc7fef92de am:
bc83db626c -s ours am:
96ec99b33a am:
7b5b22f71e
am:
f2da174999 -s ours
Change-Id: Ia9b11a40687eaee6e0d86887c86ce17d67499a2f
Adam Seaton [Tue, 17 Jan 2017 23:25:11 +0000 (23:25 +0000)]
Updating Security String to 2017-03-01 on nyc-dev am:
003e5aad03 am:
cacce5db57 am:
54b11f5c49 am:
9bbbf746ec am:
b7cb7b4f50
am:
447da95e58
Change-Id: Id8ae04a02588a788a9dc6c20b740b85c9ec5b28e
Adam Seaton [Tue, 17 Jan 2017 23:25:10 +0000 (23:25 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b am:
a37d310d61 -s ours am:
efe40b59c9 am:
0bda876342
am:
9a6c74e74d -s ours
Change-Id: I10e0fa26573fa89eae1388261916c4a169c264ce
Adam Seaton [Tue, 17 Jan 2017 23:24:48 +0000 (23:24 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098 am:
cc7fef92de am:
bc83db626c -s ours am:
96ec99b33a am:
7b5b22f71e
am:
f2da174999
Change-Id: Iab28f54f6be36e37fbdd842b72cfa2f60f33eae3
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 mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b am:
a37d310d61 -s ours am:
efe40b59c9 am:
0bda876342
am:
9a6c74e74d
Change-Id: Iff9d7522f43e685a3738832b473ea9684cdac66a
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 mnc-dev am:
b6ac653f2d am:
41f489b098 am:
cc7fef92de am:
bc83db626c -s ours am:
96ec99b33a
am:
7b5b22f71e
Change-Id: I1aee8fd6cf36d4a187a3813868bdfb1c173f2ffd
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: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 mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b am:
a37d310d61 -s ours am:
efe40b59c9
am:
0bda876342
Change-Id: I3038c9bb0e68d8a390d490a3ee0d2027eb6a7513
Android Build Merger (Role) [Tue, 17 Jan 2017 23:21:34 +0000 (23:21 +0000)]
Merge changes from topic 'am-
0c051b7e613446579b7d3dd1c98adbb7' into nyc-mr2-dev-plus-aosp
* changes:
Updating Security String to 2017-03-05 on nyc-dev am:
25b39b12ba am:
cb8fef9d91 am:
8e89e568b9 am:
8e90b1da24 am:
72e3501bd4
Updating Security String to 2017-03-01 on nyc-dev am:
003e5aad03 am:
cacce5db57 am:
54b11f5c49 am:
9bbbf746ec am:
5ac65adf12
Adam Seaton [Tue, 17 Jan 2017 23:21:18 +0000 (23:21 +0000)]
Updating Security String to 2017-03-05 on nyc-dev am:
25b39b12ba am:
cb8fef9d91 am:
8e89e568b9 am:
8e90b1da24
am:
72e3501bd4
Change-Id: I44360d127a7d578417ba5f1b5686957b7dfcc4e8
Adam Seaton [Tue, 17 Jan 2017 23:21:17 +0000 (23:21 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098 am:
cc7fef92de am:
bc83db626c -s ours
am:
96ec99b33a
Change-Id: I50ab73e3148be9895ef79f0612bf2aaab714e47f
Adam Seaton [Tue, 17 Jan 2017 23:21:16 +0000 (23:21 +0000)]
Updating Security String to 2017-03-05 on nyc-dev am:
25b39b12ba am:
cb8fef9d91 am:
8e89e568b9 am:
8e90b1da24
am:
9dc5de2366
Change-Id: I59f695b65ec0b6b81e4fb5b4ce7494a120804c54
Adam Seaton [Tue, 17 Jan 2017 23:21:16 +0000 (23:21 +0000)]
Updating Security String to 2017-03-05 on nyc-dev am:
25b39b12ba am:
cb8fef9d91 am:
8e89e568b9 am:
6bce8b94e6
am:
74ab792ef4
Change-Id: I2d265dbff4aeea7d7c279fe9aa12b087cbbf16b0
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 mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b am:
a37d310d61 -s ours
am:
efe40b59c9
Change-Id: I278b27d9e699f267ffbd0eaee4861818dc384f92
Adam Seaton [Tue, 17 Jan 2017 23:21:11 +0000 (23:21 +0000)]
Updating Security String to 2017-03-01 on nyc-dev am:
003e5aad03 am:
cacce5db57 am:
54b11f5c49 am:
9bbbf746ec
am:
5ac65adf12
Change-Id: Ie8b00516f318d8cf408cd89d8cd54544d38b7a8f
Adam Seaton [Tue, 17 Jan 2017 23:21:11 +0000 (23:21 +0000)]
Updating Security String to 2017-03-01 on nyc-dev am:
003e5aad03 am:
cacce5db57 am:
54b11f5c49 am:
9bbbf746ec
am:
b7cb7b4f50
Change-Id: If6458c264285531b087801014a1ca177a79ee0e0
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:21:11 +0000 (23:21 +0000)]
Updating Security String to 2017-03-01 on nyc-dev am:
003e5aad03 am:
cacce5db57 am:
54b11f5c49 am:
5793d02c95
am:
d26312b3e8
Change-Id: I8fbe93530589d329cda397095ed5cd4f2b7d629c
Adam Seaton [Tue, 17 Jan 2017 23:18:46 +0000 (23:18 +0000)]
Updating Security String to 2017-03-05 on nyc-dev am:
25b39b12ba am:
cb8fef9d91 am:
8e89e568b9
am:
8e90b1da24
Change-Id: Ie167252d0225afec37402e48f13ba039f76b9534
Adam Seaton [Tue, 17 Jan 2017 23:18:46 +0000 (23:18 +0000)]
Updating Security String to 2017-03-05 on nyc-dev am:
25b39b12ba am:
cb8fef9d91 am:
8e89e568b9
am:
6bce8b94e6
Change-Id: I84c148d43f6bade3e043e19160b996e1946bd556
Adam Seaton [Tue, 17 Jan 2017 23:18:45 +0000 (23:18 +0000)]
Updating Security String to 2017-03-05 on nyc-dev am:
25b39b12ba am:
cb8fef9d91 am:
8e89e568b9
am:
8e90b1da24
Change-Id: Ie7078f8b32a1709360eddc1177474c863fac0968
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: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:41 +0000 (23:18 +0000)]
Updating Security String to 2017-03-01 on nyc-dev am:
003e5aad03 am:
cacce5db57 am:
54b11f5c49
am:
9bbbf746ec
Change-Id: I3e492558fd5271a1661ecac667971f790643b720
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:41 +0000 (23:18 +0000)]
Updating Security String to 2017-03-01 on nyc-dev am:
003e5aad03 am:
cacce5db57 am:
54b11f5c49
am:
5793d02c95
Change-Id: I367ddb31c65226d381d0a16db26cf1e7dbf562bd
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:18:40 +0000 (23:18 +0000)]
Updating Security String to 2017-03-01 on nyc-dev am:
003e5aad03 am:
cacce5db57 am:
54b11f5c49
am:
9bbbf746ec
Change-Id: I192b050d434a8c9f7f1562648fcc809c35650ef2
Adam Seaton [Tue, 17 Jan 2017 23:16:16 +0000 (23:16 +0000)]
Updating Security String to 2017-03-05 on nyc-dev am:
25b39b12ba am:
cb8fef9d91
am:
8e89e568b9
Change-Id: Ia97740daf709d8c8d4bf992bf1acb8cd80fca8f4
Adam Seaton [Tue, 17 Jan 2017 23:16:15 +0000 (23:16 +0000)]
Updating Security String to 2017-03-05 on nyc-dev am:
25b39b12ba am:
cb8fef9d91
am:
8e89e568b9
Change-Id: I2d1c3808c4efbded027924a71f6f351cf3546c98
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:11 +0000 (23:16 +0000)]
Updating Security String to 2017-03-01 on nyc-dev am:
003e5aad03 am:
cacce5db57
am:
54b11f5c49
Change-Id: Iff9e2dfc5dc5f9ef260829ef3e86e834aae53b4a
Adam Seaton [Tue, 17 Jan 2017 23:16:11 +0000 (23:16 +0000)]
Updating Security String to 2017-03-01 on nyc-dev am:
003e5aad03 am:
cacce5db57
am:
54b11f5c49
Change-Id: Ib59ee26081a56298c94be19d170fc75a49335d0e
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: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:15 +0000 (23:12 +0000)]
Updating Security String to 2017-03-05 on nyc-dev am:
25b39b12ba
am:
cb8fef9d91
Change-Id: I57a8e17828c908dcdb588bb4df8e12eeeef45d27
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:12:10 +0000 (23:12 +0000)]
Updating Security String to 2017-03-01 on nyc-dev am:
003e5aad03
am:
cacce5db57
Change-Id: I090fcc6c3986a07e2a5c6cd49e82b42470ea8002
Adam Seaton [Tue, 17 Jan 2017 23:10:15 +0000 (23:10 +0000)]
Updating Security String to 2017-03-05 on nyc-dev
am:
25b39b12ba
Change-Id: I85a8100d821ed89b5c0ee4c347bb09b822c15d8d
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
Adam Seaton [Tue, 17 Jan 2017 23:10:12 +0000 (23:10 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev
am:
84888652e0 -s ours
Change-Id: Iffdd616a77cdfc1080f0b2719efd485a39232d5a
Adam Seaton [Tue, 17 Jan 2017 23:10:09 +0000 (23:10 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev
am:
a0cf89a0a0
Change-Id: I4de729620270345b03d1fb58711672392fc9c6f8
Adam Seaton [Tue, 17 Jan 2017 23:10:09 +0000 (23:10 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev
am:
28dae4b62b -s ours
Change-Id: I18f5e8d6919f1cf0e8d75781ba7c7b4cf39a6dcc
Adam Seaton [Tue, 17 Jan 2017 23:10:09 +0000 (23:10 +0000)]
Updating Security String to 2017-03-01 on nyc-dev
am:
003e5aad03
Change-Id: I5a7cec00ddc99b9b8791e2e61d21d1936d3afc4c
Connor O'Brien [Tue, 17 Jan 2017 20:22:06 +0000 (20:22 +0000)]
Merge "Pass flash erase & logical block size to mke2fs" am:
cf4f7eac85 am:
80daf82c0b am:
11fe8f5611
am:
42bff4d2eb -s ours
Change-Id: I5911500af5dc9b31b4f52f03c200cf5705f9eb5b
Connor O'Brien [Tue, 17 Jan 2017 20:19:04 +0000 (20:19 +0000)]
Merge "Pass flash erase & logical block size to mke2fs" am:
cf4f7eac85 am:
80daf82c0b
am:
11fe8f5611
Change-Id: I84f87f4e687593599323c09ea7d0e30bda51a4a4
Connor O'Brien [Tue, 17 Jan 2017 20:16:34 +0000 (20:16 +0000)]
Merge "Pass flash erase & logical block size to mke2fs" am:
cf4f7eac85
am:
80daf82c0b
Change-Id: I839d2bfc446ce327af12f12596ba8836be108ac7
Connor O'Brien [Tue, 17 Jan 2017 20:13:33 +0000 (20:13 +0000)]
Merge "Pass flash erase & logical block size to mke2fs"
am:
cf4f7eac85
Change-Id: I135f5117e4c0ac02ee22e0d2e6262894cb18b629
Connor O'Brien [Tue, 17 Jan 2017 20:07:10 +0000 (20:07 +0000)]
Merge "Pass flash erase & logical block size to mke2fs"