Adam Seaton
65b4d916e6
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev
2017-07-20 20:44:51 +00:00
Adam Seaton
451a9d73bf
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae
-s ours am: c0d2cfb8b8
...
am: 214aeaefef
-s ours
Change-Id: I5d5c9b3d264e66de20d5674f00eba3b2f4d23a3b
2017-07-19 22:15:45 +00:00
Adam Seaton
214aeaefef
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae
-s ours
...
am: c0d2cfb8b8
Change-Id: I1515e978afcc639ea122253d2ac8a310a3567db2
2017-07-19 22:12:45 +00:00
Adam Seaton
c0d2cfb8b8
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev
...
am: 788d85f5ae
-s ours
Change-Id: I8510debe7207a44a46892ce9e392c9a7f125b98f
2017-07-19 22:10:14 +00:00
TreeHugger Robot
788d85f5ae
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev
2017-07-19 22:00:58 +00:00
Adam Seaton
b8d42f935a
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
...
am: 4c9adca135
-s ours
Change-Id: I6c6632af2dc711301523e86637c4cbc6007a91ba
2017-07-19 20:56:39 +00:00
Adam Seaton
4c9adca135
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours
...
am: 4a126acfa7
Change-Id: Ic286a81fe536561739207c73178a44f7042b8430
2017-07-19 20:54:08 +00:00
Adam Seaton
4a126acfa7
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours
...
am: 6399f470f6
-s ours
Change-Id: Ife92877c9c37bd55f37a448a40a6d05e82c62781
2017-07-19 20:52:08 +00:00
Adam Seaton
6399f470f6
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
...
am: 775c752f51
-s ours
Change-Id: I593b3d0da3b49fc527745dc1d0c7f7eaca32f6ab
2017-07-19 20:49:38 +00:00
Adam Seaton
775c752f51
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
...
am: e29d61d582
Change-Id: Iebee7e9792304a0ea1e6f2fa59629a4c39526faa
2017-07-19 20:47:13 +00:00
Adam Seaton
e29d61d582
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344
...
am: 4061effbfe
Change-Id: Icd9f342e33fb61ac569132d3480d127a5e970b16
2017-07-19 20:44:08 +00:00
Adam Seaton
044c8a807d
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344
2017-07-19 18:32:35 +00:00
Adam Seaton
4061effbfe
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344
2017-07-19 18:31:28 +00:00
Adam Seaton
3da103445b
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344
2017-07-19 18:30:15 +00:00
Adam Seaton
a2603bd360
Merge changes Id4d040ea,I318fb1fc into mnc-dev
...
* changes:
[DO NOT MERGE] Updating security string to 2017-07-05 on mnc-dev bug:38342695
[DO NOT MERGE] Updating security string to 2017-07-01 on mnc-dev bug:38342695
2017-05-23 17:28:28 +00:00
Adam Seaton
025c26de91
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d
am: 54f2af92b2
am: ad8ec7f781
-s ours am: bf2d4968da
-s ours am: 05965e37e6
...
am: b3219be744
-s ours
Change-Id: Ifb51131e21dfb7fddc95d3514b494950e608af51
2017-05-19 19:35:05 +00:00
Adam Seaton
b3219be744
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d
am: 54f2af92b2
am: ad8ec7f781
-s ours am: bf2d4968da
-s ours
...
am: 05965e37e6
Change-Id: Ic1311cbf4fe550f7789f62588828299f8248518a
2017-05-19 19:33:05 +00:00
Adam Seaton
05965e37e6
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d
am: 54f2af92b2
am: ad8ec7f781
-s ours
...
am: bf2d4968da
-s ours
Change-Id: I5cd9534838910791e689a6659480d1862785ef10
2017-05-19 19:31:04 +00:00
Adam Seaton
bf2d4968da
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d
am: 54f2af92b2
...
am: ad8ec7f781
-s ours
Change-Id: I8b558f6db1b76d4169e10f78be020e8e605c0968
2017-05-19 19:29:04 +00:00
Adam Seaton
ad8ec7f781
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d
...
am: 54f2af92b2
Change-Id: I18f6472f3d3bdc7af56c95b200213ad804c38039
2017-05-19 19:27:04 +00:00
Adam Seaton
54f2af92b2
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695
...
am: e2d22d501d
Change-Id: Ic8419e3d3b12a90173888aff21a11b18f2ed2bbb
2017-05-19 19:25:35 +00:00
Adam Seaton
9f169ddbcd
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df
-s ours am: 4cfcc9fe73
...
am: 8a893de625
-s ours
Change-Id: I7407e2dd2411bc519a5499cf74c284c3fb74bdf0
2017-05-19 19:19:01 +00:00
Adam Seaton
7ad3c1407c
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
...
am: ddac9519eb
-s ours
Change-Id: Id563de5f09d1d033751273deb372cc9cc57e2c25
2017-05-19 19:18:33 +00:00
Adam Seaton
8a893de625
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df
-s ours
...
am: 4cfcc9fe73
Change-Id: I2f513d397ae199b0ea334d2254ae00a73e0b8026
2017-05-19 19:16:54 +00:00
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
4cfcc9fe73
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev
...
am: 11af5514df
-s ours
Change-Id: If06ae105d14f94816787580e5146bfd38fc85126
2017-05-19 19:14:57 +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
11af5514df
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev
2017-05-19 19:12:04 +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
2e17d83fcd
[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
...
am: d872742f52
-s ours
Change-Id: Ib653835d7a30261bd8080550c1078a504a3c6d18
2017-05-19 19:05:32 +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
7eb60e965a
[DO NOT MERGE] Updating security string to 2017-07-05 on mnc-dev
...
bug:38342695
2017-05-17 11:14:27 -07:00
Adam Seaton
261a91428d
[DO NOT MERGE] Updating security string to 2017-07-01 on mnc-dev
...
bug:38342695
2017-05-17 11:12:31 -07:00
Adam Seaton
da6692ca21
[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev
...
bug:38342695
2017-05-16 11:50:22 -07: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
e2d22d501d
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev
...
bug:38342695
2017-05-16 11:10:11 -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
f73b5cbd1f
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01
am: 12e0186aa1
...
am: 724c3d4bd9
Change-Id: Id141089035f48fd9548661af672d865b492b24b4
2017-04-12 23:13:21 +00:00
Adam Seaton
b57f591fef
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12
-s ours am: ff3f6e29e7
...
am: 13b453c917
-s ours
Change-Id: I0661e9917468d2d7dc21e48ef8ae511cff4dcba4
2017-04-12 23:13:16 +00: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
ea6878b926
Merge changes I5c252cba,I80259eef into mnc-dev
...
* changes:
[DO NOT MERGE] Update Security String to 2017-06-05 for mnc-dev
[DO NOT MERGE] Update Security String to 2017-06-01 for mnc-dev
2017-04-12 22:49:42 +00:00
Adam Seaton
9a805d9e3e
[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
...
am: fa8973ba33
-s ours
Change-Id: Ib0e73771aa5d25dd0fac1e673f3fb10731476974
2017-04-12 22:21:17 +00:00