Commit graph

20176 commits

Author SHA1 Message Date
Adam Seaton
ddac9519eb Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours
am: 0a97d3f909

Change-Id: Id4cb1b9f7811a47a0c2781e54c0571e8d5eaca3f
2017-05-19 19:16:34 +00:00
Adam Seaton
0a97d3f909 Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev
am: 18fc68549b  -s ours

Change-Id: Ib3882885ecaf352fc96578de1e5b12e1ae23a8c8
2017-05-19 19:14:34 +00:00
TreeHugger Robot
18fc68549b Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev 2017-05-19 19:09:30 +00:00
Adam Seaton
d872742f52 [DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec am: b31b3f6019 am: 652d99234a -s ours am: 387e0bb99a -s ours
am: a871e8ff81

Change-Id: I0c4e6ed39eaf707341be8af7c211764ee438855d
2017-05-19 19:03:33 +00:00
Adam Seaton
a871e8ff81 [DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec am: b31b3f6019 am: 652d99234a -s ours
am: 387e0bb99a  -s ours

Change-Id: Ic9f59110c95f7fbfae6250e6c9e174f0768df755
2017-05-19 19:02:02 +00:00
Adam Seaton
387e0bb99a [DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec am: b31b3f6019
am: 652d99234a  -s ours

Change-Id: I3d4e03afad44d825336403f23bf6ab79140e994b
2017-05-19 19:00:02 +00:00
Adam Seaton
652d99234a [DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019

Change-Id: Icc8d317d81e868b1f186f69e772d7bde628d80f7
2017-05-19 18:58:32 +00:00
Adam Seaton
b31b3f6019 [DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695
am: 35d8838aec

Change-Id: I96a3e567b8a9388ad44aeef45ccda001ab81654b
2017-05-19 18:56:32 +00:00
Adam Seaton
fd25ff16af [DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev
bug:38342695
2017-05-16 11:48:21 -07:00
Adam Seaton
35d8838aec [DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev
bug:38342695
2017-05-16 11:05:03 -07:00
Adam Seaton
724c3d4bd9 Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01
am: 12e0186aa1

Change-Id: Idf28d646ca10ff2724c213828c8f095dc4587f5a
2017-04-12 23:07:49 +00:00
Adam Seaton
13b453c917 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours
am: ff3f6e29e7

Change-Id: I353b3f3ed97e65d0db5f42409cb5229e42119e31
2017-04-12 23:07:45 +00:00
Adam Seaton
12e0186aa1 Merge changes Iee17fa80,Id9ee50be into lmp-dev
am: 9e63540d01

Change-Id: Id263677c0aaff9eb1839107e3c3104e314a64c33
2017-04-12 23:02:45 +00:00
Adam Seaton
ff3f6e29e7 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev
am: 91a21e9d12  -s ours

Change-Id: Ia3faf06a43a8c39b5a021791d2a84460539a5eb3
2017-04-12 23:02:44 +00:00
Adam Seaton
9e63540d01 Merge changes Iee17fa80,Id9ee50be into lmp-dev
* changes:
  [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev
  [DO NOT MERGE] Update Security String to 2017-06-01 for lmp-dev
2017-04-12 22:50:45 +00:00
Adam Seaton
fa8973ba33 [DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours
am: 2d19cbf722

Change-Id: Ifebd5e3fd4f621ffaaa1b477fd0c90a72e855aad
2017-04-12 22:16:46 +00:00
Adam Seaton
18c3da68f0 [DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours
am: 65101a958e

Change-Id: I523c87b067d7693b121242a73be982b4094e62bf
2017-04-12 22:16:42 +00:00
Adam Seaton
2d19cbf722 [DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours
am: 2d14a7da35  -s ours

Change-Id: I98bf2f1ac4b53269f460846a522d7e13343df169
2017-04-12 22:11:46 +00:00
Adam Seaton
65101a958e [DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours
am: 4389a11f4b  -s ours

Change-Id: I7470bfd4621f2281ee2bf03c8dd0fb0e80bba5e6
2017-04-12 22:11:42 +00:00
Adam Seaton
2d14a7da35 [DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404
am: 89ebb51f6b  -s ours

Change-Id: Iaf0beaf284058235ce55de23a99e5adae2a4eefd
2017-04-12 22:05:45 +00:00
Adam Seaton
4389a11f4b [DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07
am: 386d7ae2e8  -s ours

Change-Id: I272f3827ce226d1bde50e7391e288436277297c2
2017-04-12 22:05:41 +00:00
Adam Seaton
89ebb51f6b [DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3
am: 35e82a6404

Change-Id: Idc0ff4956a850aab3130249eb8dacfc7451ce990
2017-04-12 22:00:12 +00:00
Adam Seaton
386d7ae2e8 [DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b
am: 8dcfa2ac07

Change-Id: I3e236b94d24700299389ae02501ef8a232dad598
2017-04-12 22:00:09 +00:00
Adam Seaton
35e82a6404 [DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev
am: c686e139b3

Change-Id: I4a0954f6f3f75841d7eb54c6c7073ae6642d1c2a
2017-04-12 21:55:12 +00:00
Adam Seaton
8dcfa2ac07 [DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev
am: e6a77de43b

Change-Id: I695b346d4769e30995ea91f0e864fd95afe4866a
2017-04-12 21:55:10 +00:00
Adam Seaton
91a21e9d12 [DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev
bug:37204197
Change-Id: Iee17fa80c5c29b439bcbe85f11526a8b89247fdf
2017-04-12 21:22:54 +00:00
Adam Seaton
380441000d [DO NOT MERGE] Update Security String to 2017-06-01 for lmp-dev
bug:37204197
Change-Id: Id9ee50bec46f2fd3f9e2e5f546c062f946bff36f
2017-04-11 18:17:34 +00:00
Adam Seaton
c686e139b3 [DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev
Bug:37204197
Change-Id: I797a8c6332a3bf62ba6ba9b17de9754e7cf5a902
2017-04-10 09:38:38 -07:00
Adam Seaton
e6a77de43b [DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev
Bug:37204197
Change-Id: I7b0b5428c9b1f7ea7ab3a3e272689e6324dde8af
2017-04-10 09:36:42 -07:00
Adam Seaton
bff6f7d991 DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492 -s ours am: 1b9f1e8156 -s ours
am: b3b5777fff

Change-Id: Ie1e065ba9a5ec8342794bee335ee7e1e63e415fa
2017-03-16 16:44:49 +00:00
Adam Seaton
5af5f2c46f DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302 -s ours am: 5e0c5f0263 -s ours
am: 8edd5d7e30

Change-Id: I1af375875167b1f62073c20eb3ef3ce4c95d9f89
2017-03-16 16:44:44 +00:00
Adam Seaton
b3b5777fff DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492 -s ours
am: 1b9f1e8156  -s ours

Change-Id: I05a6a8899f3c974934ab8929642fc17f4131dacc
2017-03-16 16:41:47 +00:00
Adam Seaton
8edd5d7e30 DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302 -s ours
am: 5e0c5f0263  -s ours

Change-Id: I9a9c1d88f083e3284c0f5aa29c60b436a02991d7
2017-03-16 16:41:44 +00:00
Adam Seaton
1b9f1e8156 DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49
am: 4826d7e492  -s ours

Change-Id: Icd9c4018e5dc1b9f7857c8d3ca427381edd1beed
2017-03-16 16:39:16 +00:00
Adam Seaton
5e0c5f0263 DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690
am: 645af9a302  -s ours

Change-Id: I53784956ca6ec3d1b8f8585bfc547a8bfaee3f3e
2017-03-16 16:39:12 +00:00
Adam Seaton
88ba3a3bf8 DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca -s ours
am: 9921f826fe

Change-Id: I5b5b9756e27e84edb95b5492140c47be3b200df0
2017-03-16 16:36:18 +00:00
Adam Seaton
4826d7e492 DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a
am: f19c200a49

Change-Id: I2619378284b988335721a9d379efcae9e634e7a8
2017-03-16 16:36:17 +00:00
Adam Seaton
645af9a302 DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467
am: 7b35a39690

Change-Id: Iac15bfd4018b152302e13f12a0f5a05e85d010e4
2017-03-16 16:36:14 +00:00
Adam Seaton
3481be638f DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277 -s ours
am: 637f66925f

Change-Id: I16eaed880c8c82a432783565541be9292df620b4
2017-03-16 16:36:14 +00:00
Adam Seaton
f19c200a49 DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev
am: 3d0850957a

Change-Id: I4d62b1d3b809b1be366b649d6cd2cf036f0020b3
2017-03-16 16:32:46 +00:00
Adam Seaton
9921f826fe DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev
am: baf29229ca  -s ours

Change-Id: Ie6771d5808069e6285b7497b013de430d1dad818
2017-03-16 16:32:45 +00:00
Adam Seaton
7b35a39690 DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev
am: 41d659c467

Change-Id: I132559a9f492d3220ab8861e3575d27cb1635646
2017-03-16 16:32:43 +00:00
Adam Seaton
637f66925f DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev
am: e0b38c6277  -s ours

Change-Id: Idcd643e5e7ce612f567b3ca8a64b9e0880108423
2017-03-16 16:32:42 +00:00
Adam Seaton
baf29229ca DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev
Bug:34137924
2017-03-10 15:37:38 -08:00
Adam Seaton
e0b38c6277 DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev
Bug:34137924
2017-03-10 15:36:31 -08:00
Adam Seaton
3d0850957a DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev
Bug:36137924
2017-03-10 15:34:58 -08:00
Adam Seaton
41d659c467 DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev
Bug:36137924
2017-03-10 15:31:30 -08:00
Adam Seaton
a150db6547 [DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76 -s ours am: 8f86884a97 -s ours
am: c901cec8b2

Change-Id: Ie35c57a24abb4638ac3372d42913d3e4cad5410a
2017-02-13 23:24:42 +00:00
Adam Seaton
bc19d8140c [DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4 am: ed38784898 -s ours am: 84702d9919 -s ours
am: d466175346

Change-Id: I0fc9d82d3181bbf98cc5c35bd7f0be9c593b785d
2017-02-13 23:24:37 +00:00
Adam Seaton
c901cec8b2 [DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76 -s ours
am: 8f86884a97  -s ours

Change-Id: I46d21630e67552086c193d65d78d86e8b96872d1
2017-02-13 23:21:40 +00:00