OSDN Git Service
Sandeep Patil [Wed, 18 Jan 2017 00:50:36 +0000 (00:50 +0000)]
SELinux: split service_contexts into platform and non-platform components. am:
e4ade08f63 am:
0068df10f6
am:
29c9cb811d
Change-Id: Ia50fec868a07669ab9e20c212684892e248ff24b
Sandeep Patil [Wed, 18 Jan 2017 00:46:05 +0000 (00:46 +0000)]
SELinux: split service_contexts into platform and non-platform components. am:
e4ade08f63
am:
0068df10f6
Change-Id: I0c049562c6afb08c2fc3bb033be874e483d68ddb
Sandeep Patil [Wed, 18 Jan 2017 00:41:03 +0000 (00:41 +0000)]
SELinux: split service_contexts into platform and non-platform components.
am:
e4ade08f63
Change-Id: Icad4eca1ac22b99a6aa0f130799143ee89727f55
Android Build Merger (Role) [Tue, 17 Jan 2017 23:43:08 +0000 (23:43 +0000)]
Merge changes from topic 'am-
8f2774833da54dc1bf4ce7062adbf934' into nyc-mr2-dev-plus-aosp
* changes:
[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 am:
bf3f53de1f am:
91e97eda54 am:
28332a1767 am:
b243bee240 am:
ac3e93e3b4
[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 am:
e4f0c9db37 am:
0e5257bcb7 am:
13da0e1089 am:
0a4b68bee7 am:
e6906d8961
Adam Seaton [Tue, 17 Jan 2017 23:42:52 +0000 (23:42 +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 am:
bf3f53de1f am:
91e97eda54 am:
28332a1767 am:
b243bee240
am:
d672d69641
Change-Id: Ib8221434812089d823781435e17b64413c4b0f19
Adam Seaton [Tue, 17 Jan 2017 23:42:52 +0000 (23:42 +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 am:
bf3f53de1f am:
91e97eda54 am:
28332a1767 am:
b243bee240
am:
ac3e93e3b4
Change-Id: Ic6433947c1764ca54ccbd3967ced14788012ae23
Adam Seaton [Tue, 17 Jan 2017 23:42:43 +0000 (23:42 +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 am:
e4f0c9db37 am:
0e5257bcb7 am:
13da0e1089 am:
0a4b68bee7
am:
e69a8f1710
Change-Id: I033e4f845fc2645c4586616c2ced29a2052a4362
Adam Seaton [Tue, 17 Jan 2017 23:42:43 +0000 (23:42 +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 am:
e4f0c9db37 am:
0e5257bcb7 am:
13da0e1089 am:
0a4b68bee7
am:
e6906d8961
Change-Id: Ide7fc48d153d1d30415c15581e3272e4cd7567a1
Adam Seaton [Tue, 17 Jan 2017 23:40:52 +0000 (23:40 +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 am:
bf3f53de1f am:
91e97eda54 am:
28332a1767
am:
b243bee240
Change-Id: I377c335de55d4ace879f5bfd9ee4fdea0a47dc8a
Adam Seaton [Tue, 17 Jan 2017 23:40:50 +0000 (23:40 +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 am:
bf3f53de1f am:
91e97eda54 am:
28332a1767
am:
b243bee240
Change-Id: Ia7ecd0e0ceb11ef3ff543674dfad20332f807201
Adam Seaton [Tue, 17 Jan 2017 23:40:43 +0000 (23:40 +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 am:
e4f0c9db37 am:
0e5257bcb7 am:
13da0e1089
am:
0a4b68bee7
Change-Id: I0a6aada7d6fac92cb7739af7ec6eec4af7a481f4
Adam Seaton [Tue, 17 Jan 2017 23:40:43 +0000 (23:40 +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 am:
e4f0c9db37 am:
0e5257bcb7 am:
13da0e1089
am:
0a4b68bee7
Change-Id: I4751946af4cc4837693c132ca8007ec18730fac6
Adam Seaton [Tue, 17 Jan 2017 23:38:21 +0000 (23:38 +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 am:
bf3f53de1f am:
91e97eda54
am:
28332a1767
Change-Id: I227d27e63b707f037671cf8c0b783833f0f6ab93
Adam Seaton [Tue, 17 Jan 2017 23:38:14 +0000 (23:38 +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 am:
e4f0c9db37 am:
0e5257bcb7
am:
13da0e1089
Change-Id: I3e72055f0873a08ac9d0d4049c52f2653bc3e74f
Android Build Merger (Role) [Tue, 17 Jan 2017 23:36:06 +0000 (23:36 +0000)]
Merge changes from topic 'am-
1ca7f6cf4c7e4b4fb54938d8b0fff1f0' into nyc-mr2-dev-plus-aosp
* changes:
[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:
78052362cf
[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
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 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 am:
bf3f53de1f
am:
91e97eda54
Change-Id: I962a1306117126258586fa159e423f7a3957f784
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 am:
85b71b92b5
am:
78052362cf
Change-Id: Icaeee68ef7d16ae61c4a3b5082a23632532fe3da
Adam Seaton [Tue, 17 Jan 2017 23:35:43 +0000 (23:35 +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 am:
e4f0c9db37
am:
0e5257bcb7
Change-Id: Ie8d8e1be3cb6dce9ba11ceaea869812f800c9857
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 am:
fd459b20de
am:
58488c7d70
Change-Id: I58244342dd55fa52973d8bd5021c8d5de87e4fc5
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: Ia9969d04fdef2500bb8817516c49614902689739
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:49 +0000 (23:33 +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
am:
bf3f53de1f
Change-Id: I4e4e3780201091a43e96c9217cccc443ca9b0415
Adam Seaton [Tue, 17 Jan 2017 23:33:42 +0000 (23:33 +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
am:
e4f0c9db37
Change-Id: I3357dcf0df1bd6ecb4acb11948362f1e22c883d5
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: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: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: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: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 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
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 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 am:
543c171c07
am:
d64b7a3366
Change-Id: Ibf076c8904650a445d565f545412304d653620e9
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: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: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 am:
f3804904a0
am:
f5d39d139a
Change-Id: I43f3703d0a0b5fcc8a6e5a6ae8bc943b88af1a95
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: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 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: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: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: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 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: 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 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: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: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: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 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: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 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: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 mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b am:
a37d310d61 -s ours am:
efe40b59c9
am:
0bda876342
Change-Id: I3038c9bb0e68d8a390d490a3ee0d2027eb6a7513
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
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)]
[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: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)]
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: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: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: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: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: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 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: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: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)]
[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)]
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: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: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)]
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: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)]
Updating Security String to 2017-03-05 on nyc-dev
am:
25b39b12ba
Change-Id: I85a8100d821ed89b5c0ee4c347bb09b822c15d8d