OSDN Git Service

android-x86/build.git
7 years agoSELinux: split service_contexts into platform and non-platform components. am: e4ade08f63
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

7 years agoSELinux: split service_contexts into platform and non-platform components.
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4 am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4 am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4 am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am: 84888652e0 ...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4 am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am: 28dae4b62b ...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am: 84888652e0 ...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am: 28dae4b62b ...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4 am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am: 84888652e0 ...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am: 28dae4b62b ...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4 am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am: 84888652e0 ...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am: b6ac653f2d am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am: 28dae4b62b ...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4 am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am: a0cf89a0a0 am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am: b6ac653f2d am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am: 84888652e0 ...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4 am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am: a0cf89a0a0 am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am: 28dae4b62b ...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am: b6ac653f2d am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am: 84888652e0 ...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am: 28dae4b62b ...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4 am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am: a0cf89a0a0 am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am: b6ac653f2d am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am: 84888652e0 ...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4 am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am: a0cf89a0a0 am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am: 28dae4b62b ...
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

7 years agoUpdating Security String to 2017-03-05 on nyc-dev am: 25b39b12ba am: cb8fef9d91 am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am: 84888652e0 ...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am: b6ac653f2d am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am: 28dae4b62b ...
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

7 years agoUpdating Security String to 2017-03-01 on nyc-dev am: 003e5aad03 am: cacce5db57 am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4 am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am: a0cf89a0a0 am...
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

7 years agoUpdating Security String to 2017-03-05 on nyc-dev am: 25b39b12ba am: cb8fef9d91
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am: b6ac653f2d am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am: 84888652e0 ...
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

7 years agoUpdating Security String to 2017-03-01 on nyc-dev am: 003e5aad03 am: cacce5db57
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am: 28dae4b62b ...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am: a0cf89a0a0 am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4 am...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am: b6ac653f2d
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am: a0cf89a0a0
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4
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

7 years agoUpdating Security String to 2017-03-05 on nyc-dev am: 25b39b12ba
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am: 84888652e0 ...
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am: 28dae4b62b ...
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

7 years agoUpdating Security String to 2017-03-01 on nyc-dev am: 003e5aad03
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev
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

7 years agoUpdating Security String to 2017-03-05 on nyc-dev
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev
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

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev
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

7 years agoUpdating Security String to 2017-03-01 on nyc-dev
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

7 years agoMerge "Pass flash erase & logical block size to mke2fs" am: cf4f7eac85
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

7 years agoMerge "Pass flash erase & logical block size to mke2fs"
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

7 years agoMerge "Pass flash erase & logical block size to mke2fs"
Connor O'Brien [Tue, 17 Jan 2017 20:07:10 +0000 (20:07 +0000)]
Merge "Pass flash erase & logical block size to mke2fs"

7 years agoUpdating Security String to 2017-03-05 on nyc-dev
Adam Seaton [Tue, 17 Jan 2017 19:37:18 +0000 (11:37 -0800)]
Updating Security String to 2017-03-05 on nyc-dev

b/34345751

Change-Id: Ieaaccd7b92c85bb3389fab5e03011892bf7fdcba

7 years agoUpdating Security String to 2017-03-01 on nyc-dev
Adam Seaton [Tue, 17 Jan 2017 19:36:19 +0000 (11:36 -0800)]
Updating Security String to 2017-03-01 on nyc-dev

b/34345751

Change-Id: I55d9ba3f16264f9e4f9ad72e861527a3f8ae566c

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev
Adam Seaton [Tue, 17 Jan 2017 19:34:17 +0000 (11:34 -0800)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev

b/34345751

Change-Id: Id3a3555a1bf333895d9980ca9477304bd9660b38

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev
Adam Seaton [Tue, 17 Jan 2017 19:33:25 +0000 (11:33 -0800)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev

b/34345751

Change-Id: I135c327aa611e92775966c4960f9da6e2aa95ed9

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev
Adam Seaton [Tue, 17 Jan 2017 19:29:08 +0000 (11:29 -0800)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev

b/34345751

Change-Id: Ie5bd1ced37f4ca9642c572ca0e3e0008bf1639e8

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev
Adam Seaton [Tue, 17 Jan 2017 19:28:06 +0000 (11:28 -0800)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev

b/34345751

Change-Id: I001816a1f60aa4229b8fb96a96737bcebf416cef

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev
Adam Seaton [Tue, 17 Jan 2017 19:25:07 +0000 (11:25 -0800)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev
b/34345751

Change-Id: Ib1ea316e49631a4c5294db5f6260b5fdd364baa6

7 years ago[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev
Adam Seaton [Tue, 17 Jan 2017 19:23:27 +0000 (11:23 -0800)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev

b/34345751

Change-Id: I159221baf765da3f31d5f7e92e4a899c17300eae

7 years agoSELinux: split service_contexts into platform and non-platform components.
Sandeep Patil [Tue, 27 Dec 2016 23:09:03 +0000 (15:09 -0800)]
SELinux: split service_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: I6fec8d9b3023de09d69198c9e72311a1f03fe844
Signed-off-by: Sandeep Patil <sspatil@google.com>
7 years agoAllow /dev/goldfish_sync
Lingfeng Yang [Tue, 17 Jan 2017 00:45:28 +0000 (00:45 +0000)]
Allow /dev/goldfish_sync
am: bdceef4325

Change-Id: Iaa5b0fe304e3b65a4e58949d9c8fc7b3ce5f83ec

7 years agoMerge "releasetools: Replace print stmt with print()." am: 4a0b494eea
Tao Bao [Sat, 14 Jan 2017 15:43:26 +0000 (15:43 +0000)]
Merge "releasetools: Replace print stmt with print()." am: 4a0b494eea
am: 0e2a0fd76c

Change-Id: I4efbff199c3a44ddc33a0e46cdd64a6c949c5262

7 years agoMerge "releasetools: Replace print stmt with print()."
Tao Bao [Sat, 14 Jan 2017 15:40:27 +0000 (15:40 +0000)]
Merge "releasetools: Replace print stmt with print()."
am: 4a0b494eea

Change-Id: I8823ee5f778c3017d85c1fa6d0f159ad85178314

7 years agoMerge "releasetools: Replace print stmt with print()."
Tao Bao [Sat, 14 Jan 2017 15:36:40 +0000 (15:36 +0000)]
Merge "releasetools: Replace print stmt with print()."

7 years agoMerge "releasetools: Delete the obsolete --aslr_mode/-a flag." am: ecbb31e8c4
Tao Bao [Sat, 14 Jan 2017 08:16:43 +0000 (08:16 +0000)]
Merge "releasetools: Delete the obsolete --aslr_mode/-a flag." am: ecbb31e8c4
am: 82c2fb0e21

Change-Id: If3acd29bc8854d1c1e2b53216f5e984cdd46c0e9

7 years agoMerge "releasetools: Delete the obsolete --aslr_mode/-a flag."
Tao Bao [Sat, 14 Jan 2017 08:13:43 +0000 (08:13 +0000)]
Merge "releasetools: Delete the obsolete --aslr_mode/-a flag."
am: ecbb31e8c4

Change-Id: I648906871d064a309b21eca4c8718bb15381f086

7 years agoMerge "releasetools: Delete the obsolete --aslr_mode/-a flag."
Treehugger Robot [Sat, 14 Jan 2017 08:08:30 +0000 (08:08 +0000)]
Merge "releasetools: Delete the obsolete --aslr_mode/-a flag."

7 years agoreleasetools: Replace print stmt with print().
Tao Bao [Tue, 10 Jan 2017 18:47:58 +0000 (10:47 -0800)]
releasetools: Replace print stmt with print().

So that it's compatible with Python 3.

Test: pylint --pylint=pylintrc

Change-Id: If06c135a492c94bedd713c8cbdf03155a502d5cd

7 years agoreleasetools: Delete the obsolete --aslr_mode/-a flag.
Tao Bao [Fri, 13 Jan 2017 19:56:54 +0000 (11:56 -0800)]
releasetools: Delete the obsolete --aslr_mode/-a flag.

It was added in commit 96be7205dce97977909e93b73f48779fcce3bc65
("Working ASLR implementation.") in 2010, and removed in commit
1807e700a568d57901b835370d1b1ae05c3dbb0f ("don't generate retouch
commands in OTA scripts") in 2012.

Remove the obsolete --aslr_mode flag.

Test: ota_from_target_files.py still works (by generating incremental
      and full OTAs respectively).

Change-Id: I6d8e62730ac192f3574d484c4a4b9b43b4ee0a9e

7 years agoMerge "Include CarrierDefaultApp to the img" am: 5e6ce5f504
Chen Xu [Fri, 13 Jan 2017 22:10:32 +0000 (22:10 +0000)]
Merge "Include CarrierDefaultApp to the img" am: 5e6ce5f504
am: 10253bbea9

Change-Id: If9e2c093b2a0802c639b1a0d88e913300e94a3c0

7 years agoMerge "Include CarrierDefaultApp to the img"
Chen Xu [Fri, 13 Jan 2017 22:08:32 +0000 (22:08 +0000)]
Merge "Include CarrierDefaultApp to the img"
am: 5e6ce5f504

Change-Id: Ibe79b9b961f6a04535e2f34e3da2ef1e3367a9d9

7 years agoMerge "Include CarrierDefaultApp to the img"
Chen Xu [Fri, 13 Jan 2017 21:59:23 +0000 (21:59 +0000)]
Merge "Include CarrierDefaultApp to the img"