OSDN Git Service
Jorim Jaggi [Wed, 18 Jan 2017 15:28:54 +0000 (16:28 +0100)]
Revert "SELinux: split property_contexts into platform and non-platform components."
This reverts commit
c5ffdd4bb44bae3ad67ecea745f79b0a05015708.
Sandeep Patil [Wed, 18 Jan 2017 06:29:25 +0000 (06:29 +0000)]
Merge "SELinux: split property_contexts into platform and non-platform components." am:
f91d163625 am:
cb0a92be8b am:
e3ce754d96
am:
2e0e89a0f5
Change-Id: If7a7c4351e8cb6e395b02790222892578e4f833c
Sandeep Patil [Wed, 18 Jan 2017 06:27:05 +0000 (06:27 +0000)]
SELinux: split property_contexts into platform and non-platform components. am:
c5ffdd4bb4 am:
a94ae916ce am:
eec071a34a
am:
8a3f41af27
Change-Id: I7d859256d4e0b3fed0a58932d5ddc9498a69c1eb
Sandeep Patil [Wed, 18 Jan 2017 06:24:38 +0000 (06:24 +0000)]
Merge "SELinux: split property_contexts into platform and non-platform components." am:
f91d163625 am:
cb0a92be8b
am:
e3ce754d96
Change-Id: I3cec1cfe55262b018a12559e94dbb1c0c6492a01
Sandeep Patil [Wed, 18 Jan 2017 06:22:01 +0000 (06:22 +0000)]
SELinux: split property_contexts into platform and non-platform components. am:
c5ffdd4bb4 am:
a94ae916ce
am:
eec071a34a
Change-Id: I675d59aabc9c6aab96e986413ebc03d5cf80eead
Sandeep Patil [Wed, 18 Jan 2017 06:19:13 +0000 (06:19 +0000)]
Merge "SELinux: split property_contexts into platform and non-platform components." am:
f91d163625
am:
cb0a92be8b
Change-Id: Icf60fccc8999b98dbf07cd52a4d34ce2b118dab8
Sandeep Patil [Wed, 18 Jan 2017 06:17:24 +0000 (06:17 +0000)]
Merge "SELinux: split property_contexts into platform and non-platform components."
am:
f91d163625
Change-Id: I014a2249a6bc7808292a3253721fe0d6724cd344
Sandeep Patil [Wed, 18 Jan 2017 06:16:59 +0000 (06:16 +0000)]
SELinux: split property_contexts into platform and non-platform components. am:
c5ffdd4bb4
am:
a94ae916ce
Change-Id: I91f8f35dbf12f97ba81d7d45951323eccf298cf2
Sandeep Patil [Wed, 18 Jan 2017 06:12:26 +0000 (06:12 +0000)]
SELinux: split property_contexts into platform and non-platform components.
am:
c5ffdd4bb4
Change-Id: Id6a41eb5a4c1cc63c6ca93197f357a7de0604bab
Treehugger Robot [Wed, 18 Jan 2017 06:09:02 +0000 (06:09 +0000)]
Merge "SELinux: split property_contexts into platform and non-platform components."
Sandeep Patil [Wed, 18 Jan 2017 00:55:15 +0000 (00:55 +0000)]
Merge "SELinux: split service_contexts into platform and non-platform components." am:
a91d63fa65 am:
bbf5e0b99b am:
fbd4ec4d59
am:
7500744864
Change-Id: I0ebb64a50104b13c20af77b3126b3c6e10c5f65f
Sandeep Patil [Wed, 18 Jan 2017 00:55:09 +0000 (00:55 +0000)]
SELinux: split service_contexts into platform and non-platform components. am:
e4ade08f63 am:
0068df10f6 am:
29c9cb811d
am:
d091ce20b1
Change-Id: I3331c1b48a75374f675d8527255d3d28ed3251bd
Sandeep Patil [Wed, 18 Jan 2017 00:50:46 +0000 (00:50 +0000)]
Merge "SELinux: split service_contexts into platform and non-platform components." am:
a91d63fa65 am:
bbf5e0b99b
am:
fbd4ec4d59
Change-Id: I236a97bff0f22db1499fdedbdb533d6159d8b28f
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:12 +0000 (00:46 +0000)]
Merge "SELinux: split service_contexts into platform and non-platform components." am:
a91d63fa65
am:
bbf5e0b99b
Change-Id: I080b0b58e8c86a444f43fa65c7a92187e9a4fd5f
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:38 +0000 (00:41 +0000)]
Merge "SELinux: split service_contexts into platform and non-platform components."
am:
a91d63fa65
Change-Id: I872a51e28f8cd70972c1d924ba6591c0e9df4f13
Sandeep Patil [Tue, 27 Dec 2016 23:47:06 +0000 (15:47 -0800)]
SELinux: split property_contexts into platform and non-platform components.
Bug:
33746484
Test: Successfully boot with original service and property contexts.
Successfully boot with split serivce and property contexts.
Change-Id: I1f218ca842407d30650b8987ded6679672171091
Signed-off-by: Sandeep Patil <sspatil@google.com>
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
Treehugger Robot [Wed, 18 Jan 2017 00:36:55 +0000 (00:36 +0000)]
Merge "SELinux: split service_contexts into platform and non-platform components."
Adam Seaton [Tue, 17 Jan 2017 23:46:08 +0000 (23:46 +0000)]
Merge changes from topic 'am-
8f2774833da54dc1bf4ce7062adbf934' into nyc-mr2-dev-plus-aosp
am:
9f58ec2f1c
Change-Id: I3284def1320104dd8c38f0a23f43112f576a2518
Adam Seaton [Tue, 17 Jan 2017 23:46:06 +0000 (23:46 +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
am:
f42172ccc7 -s ours
Change-Id: I4ddbfe3915089f8356255c15135b90366c4f43d0
Adam Seaton [Tue, 17 Jan 2017 23:45:52 +0000 (23:45 +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
am:
15016225c6 -s ours
Change-Id: I1e6d047023c771aa49f4bce2857e9459d0739e80
Adam Seaton [Tue, 17 Jan 2017 23:45:23 +0000 (23:45 +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
am:
dcd75eb9c6 -s ours
Change-Id: I7d82e9c054fc124e46e0338cea2e64e53de6578c
Adam Seaton [Tue, 17 Jan 2017 23:45:13 +0000 (23:45 +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
am:
925e40dcaa -s ours
Change-Id: I79ff7f4a6ff5e71a2ab1f41880d1d113600a0cc2
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:
ac3e93e3b4
Change-Id: Ic6433947c1764ca54ccbd3967ced14788012ae23
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:50 +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 -s ours am:
34212f0840 -s ours
am:
bf0384ade8 -s ours
Change-Id: I660334182f82cae8031fac9820c6329fe2e11c20
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: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 -s ours am:
57d5212296 -s ours
am:
d7f349d956 -s ours
Change-Id: I8beffbbe8a6d65de1f109cca484901a75803095c
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:49 +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 -s ours
am:
34212f0840 -s ours
Change-Id: Iabe97a75d4a8abd99a5123743ce32fccec29d0ed
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: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 -s ours
am:
57d5212296 -s ours
Change-Id: I21b200130eafbaf4a84f481a380ef145a7a1e812
Adam Seaton [Tue, 17 Jan 2017 23:38:55 +0000 (23:38 +0000)]
Merge changes from topic 'am-
1ca7f6cf4c7e4b4fb54938d8b0fff1f0' into nyc-mr2-dev-plus-aosp
am:
791cfd0d57
Change-Id: I41fae4c8ea7dc68f465bb6b875746fb9448bd93a
Adam Seaton [Tue, 17 Jan 2017 23:38:52 +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:
78052362cf
am:
ee73e2ed91 -s ours
Change-Id: Id664e93cbf1673216d6ba0872774d3a4e0516e01
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: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: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:19 +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 -s ours
Change-Id: I6a5ede2b63bd388f605dd24ea02ecd1b6f8fef47
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
Adam Seaton [Tue, 17 Jan 2017 23:38:13 +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 -s ours
Change-Id: I4d624b2d8f3d4dc17e7176ab7365d78a597999bb
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
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 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: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 -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 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 -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: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 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: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 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: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: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
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 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: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: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 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 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 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: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: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 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: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