OSDN Git Service

android-x86/build.git
7 years agoMerge "Revert "SELinux: split property_contexts into platform and non-platform compon...
Jorim Jaggi [Wed, 18 Jan 2017 18:18:56 +0000 (18:18 +0000)]
Merge "Revert "SELinux: split property_contexts into platform and non-platform components."" am: ce0bae2f47 am: 27b7101c6c
am: 4f34f3d6f0

Change-Id: Ied71fc8b2771ba2383723f83554abb8153c1d9ec

7 years agoRevert "SELinux: split property_contexts into platform and non-platform components...
Jorim Jaggi [Wed, 18 Jan 2017 18:18:46 +0000 (18:18 +0000)]
Revert "SELinux: split property_contexts into platform and non-platform components." am: 8cbd925748 am: b909e2c1aa
am: 82968395c1

Change-Id: I5b5d6bd944b4aed152aebaed7e3758cbcbfb0411

7 years agoMerge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev am: 11111d875f
Nimrod Gileadi [Wed, 18 Jan 2017 17:00:24 +0000 (17:00 +0000)]
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev am: 11111d875f
am: d70bbef6bc

Change-Id: Ie9bba383ca175ee50b393918f09c12203f5219c5

7 years agoCopy IDC for goldfish_rotary to /system/usr/idc am: 8570bcea52
Nimrod Gileadi [Wed, 18 Jan 2017 16:59:52 +0000 (16:59 +0000)]
Copy IDC for goldfish_rotary to /system/usr/idc am: 8570bcea52
am: edfdd39433

Change-Id: I140c793c21fa7ec9b9422c94558aa842e013bb22

7 years agoMerge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
Nimrod Gileadi [Wed, 18 Jan 2017 16:53:53 +0000 (16:53 +0000)]
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
am: 11111d875f

Change-Id: I08546a16803fa27c99a39c15ef8cb1b12aa63249

7 years agoCopy IDC for goldfish_rotary to /system/usr/idc
Nimrod Gileadi [Wed, 18 Jan 2017 16:53:23 +0000 (16:53 +0000)]
Copy IDC for goldfish_rotary to /system/usr/idc
am: 8570bcea52

Change-Id: I2a699ee186c08b60f2f5f98a00a0a5cc3230944c

7 years agoMerge "Revert "SELinux: split property_contexts into platform and non-platform compon...
Jorim Jaggi [Wed, 18 Jan 2017 16:47:50 +0000 (16:47 +0000)]
Merge "Revert "SELinux: split property_contexts into platform and non-platform components."" am: ce0bae2f47
am: 27b7101c6c

Change-Id: Idce14b6caac043b5c2880c1d46365ad0610f48a3

7 years agoRevert "SELinux: split property_contexts into platform and non-platform components...
Jorim Jaggi [Wed, 18 Jan 2017 16:47:43 +0000 (16:47 +0000)]
Revert "SELinux: split property_contexts into platform and non-platform components." am: 8cbd925748
am: b909e2c1aa

Change-Id: I4549c025a473768a504a908acf388abc0266f616

7 years agoMerge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
Nimrod Gileadi [Wed, 18 Jan 2017 16:44:35 +0000 (16:44 +0000)]
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev

7 years agoMerge "Revert "SELinux: split property_contexts into platform and non-platform compon...
Jorim Jaggi [Wed, 18 Jan 2017 16:42:00 +0000 (16:42 +0000)]
Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""
am: ce0bae2f47

Change-Id: I230c5966278be38339fd369075be30320d27bcd2

7 years agoRevert "SELinux: split property_contexts into platform and non-platform components."
Jorim Jaggi [Wed, 18 Jan 2017 16:41:33 +0000 (16:41 +0000)]
Revert "SELinux: split property_contexts into platform and non-platform components."
am: 8cbd925748

Change-Id: Id5007d02d02bf27e7ab96c48dbecb908f81dd496

7 years agoMerge "Revert "SELinux: split property_contexts into platform and non-platform compon...
Jorim Jaggi [Wed, 18 Jan 2017 16:33:31 +0000 (16:33 +0000)]
Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""

7 years agoRevert "SELinux: split property_contexts into platform and non-platform components."
Jorim Jaggi [Wed, 18 Jan 2017 15:37:30 +0000 (15:37 +0000)]
Revert "SELinux: split property_contexts into platform and non-platform components."

This reverts commit c5ffdd4bb44bae3ad67ecea745f79b0a05015708.

Change-Id: I4c5fa6c68cbf0124117153660a2fd363f72388b6

7 years agoCopy IDC for goldfish_rotary to /system/usr/idc
Nimrod Gileadi [Tue, 17 Jan 2017 20:07:56 +0000 (20:07 +0000)]
Copy IDC for goldfish_rotary to /system/usr/idc

This IDC file won't be used by the emulator, unless there's an input
device called goldfish_rotary. That device is being added to the kernel
in http://r.android.com/321420.

Once that device is present, EventHub will look for a file named
goldfish_rotary.idc in the system/usr/idc directory to get the device
configuration.

Bug: 33292948
Change-Id: I384f29980d802280e626915844bddc49bc46110d

7 years agoMerge "SELinux: split property_contexts into platform and non-platform components...
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

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

7 years agoMerge "SELinux: split property_contexts into platform and non-platform components...
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

7 years agoMerge "SELinux: split property_contexts into platform and non-platform components."
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

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

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

7 years agoMerge "SELinux: split property_contexts into platform and non-platform components."
Treehugger Robot [Wed, 18 Jan 2017 06:09:02 +0000 (06:09 +0000)]
Merge "SELinux: split property_contexts into platform and non-platform components."

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

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

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

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 agoMerge "SELinux: split service_contexts into platform and non-platform components."
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

7 years agoSELinux: split property_contexts into platform and non-platform components.
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>
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 agoMerge "SELinux: split service_contexts into platform and non-platform components."
Treehugger Robot [Wed, 18 Jan 2017 00:36:55 +0000 (00:36 +0000)]
Merge "SELinux: split service_contexts into platform and non-platform components."

7 years agoMerge changes from topic 'am-8f2774833da54dc1bf4ce7062adbf934' into nyc-mr2-dev-plus...
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

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: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

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: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

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: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

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: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

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-05 on klp-dev b/34345751 am: 3597d...
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

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-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: I4751946af4cc4837693c132ca8007ec18730fac6

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 agoMerge changes from topic 'am-1ca7f6cf4c7e4b4fb54938d8b0fff1f0' into nyc-mr2-dev-plus...
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

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: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

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-05 on lmp-dev am: 84888652e0 ...
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

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-01 on lmp-dev am: 28dae4b62b ...
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

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: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

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 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: I999c636afbc64d3014db724179e74dd77d892780

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: I891f8c6cfe6bed1ff6aa9907a07b8b1d07719a97

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 agoMerge changes from topic 'am-9f9d40fcc7ff4201b2e6e3c9473f45a9' into nyc-mr2-dev-plus...
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

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 mnc-dev am: b6ac653f2d am...
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

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: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

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 mnc-dev am: a0cf89a0a0 am...
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

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-01 on mnc-dev am: a0cf89a0a0 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 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

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 mnc-dev am: b6ac653f2d am...
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

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 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-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: Id5412c138fccbf26ac05eb28f20a56cf4e3f1580

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 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 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 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 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-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 agoMerge changes from topic 'am-0c051b7e613446579b7d3dd1c98adbb7' into nyc-mr2-dev-plus...
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

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

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

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 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 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-01 on nyc-dev am: 003e5aad03 am: cacce5db57 am...
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

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

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

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