Adam Seaton
fbd8bcf329
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b
am: bf38f45749
...
am: 40720f6a25
Change-Id: I8cfa5ccc04fa609f926b27068214ab96c42eb772
2017-09-06 23:10:23 +00:00
Adam Seaton
40720f6a25
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b
...
am: bf38f45749
Change-Id: I10e741ba36e2f3570d70698fdece3d43dc93ad12
2017-09-06 23:05:23 +00:00
Adam Seaton
bf38f45749
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev
...
am: 84557be29b
Change-Id: I9289b586b2aa28590dde1cdc90d21a45c4a27dbb
2017-09-06 23:00:22 +00:00
Adam Seaton
84557be29b
Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev
2017-09-06 22:44:40 +00:00
Adam Seaton
09ec3bc311
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
am: dafd187ab5
am: 47c92b6200
-s ours am: bc464d7e8f
-s ours am: 5c68c85011
am: f1f39061a7
-s ours am: c5287e96a4
am: 0412b3d0e3
...
am: 2df41e5dec
Change-Id: I44e724a1ae1c78ac10c6413e85c93702803eda0d
2017-08-22 17:27:59 +00:00
Adam Seaton
2df41e5dec
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
am: dafd187ab5
am: 47c92b6200
-s ours am: bc464d7e8f
-s ours am: 5c68c85011
am: f1f39061a7
-s ours am: c5287e96a4
...
am: 0412b3d0e3
Change-Id: I7ffb634572190d260e9cefbda381114b0ff7537b
2017-08-22 17:25:28 +00:00
Adam Seaton
0412b3d0e3
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
am: dafd187ab5
am: 47c92b6200
-s ours am: bc464d7e8f
-s ours am: 5c68c85011
am: f1f39061a7
-s ours
...
am: c5287e96a4
Change-Id: I129e68c1addd7715f135c1a80453e52e3fc66db1
2017-08-22 17:23:27 +00:00
Adam Seaton
7c50949d13
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3
-s ours am: b40465ed59
am: acc7e47faa
-s ours am: 286c80e90a
am: 3b9a25dc46
...
am: 9f7048b3b5
Change-Id: I71139b08f59aba5e50478bdb256460a7963cd217
2017-08-22 17:21:00 +00:00
Adam Seaton
c5287e96a4
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
am: dafd187ab5
am: 47c92b6200
-s ours am: bc464d7e8f
-s ours am: 5c68c85011
...
am: f1f39061a7
-s ours
Change-Id: I581219ddf6a09b037122c6eb4650392ae01b3737
2017-08-22 17:20:56 +00:00
Adam Seaton
9f7048b3b5
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3
-s ours am: b40465ed59
am: acc7e47faa
-s ours am: 286c80e90a
...
am: 3b9a25dc46
Change-Id: I7066b5941ac25cc276e7dabff6ae9be9aab50c9a
2017-08-22 17:18:58 +00:00
Adam Seaton
f1f39061a7
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
am: dafd187ab5
am: 47c92b6200
-s ours am: bc464d7e8f
-s ours
...
am: 5c68c85011
Change-Id: I7ce43a00a8dc3ab19aad0110c434ea5d92d9d6cf
2017-08-22 17:18:57 +00:00
Adam Seaton
3b9a25dc46
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3
-s ours am: b40465ed59
am: acc7e47faa
-s ours
...
am: 286c80e90a
Change-Id: I7fc0c8c77629acf745ad25006e0d2369e438dbbd
2017-08-22 17:16:58 +00:00
Adam Seaton
5c68c85011
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
am: dafd187ab5
am: 47c92b6200
-s ours
...
am: bc464d7e8f
-s ours
Change-Id: Iabc705be0af053ce2c3d2e316db03f86e5f61fc5
2017-08-22 17:16:58 +00:00
Adam Seaton
286c80e90a
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3
-s ours am: b40465ed59
...
am: acc7e47faa
-s ours
Change-Id: I9d67def30e178e69c775efe69a13f74d85ee4459
2017-08-22 17:13:24 +00:00
Adam Seaton
bc464d7e8f
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
am: dafd187ab5
...
am: 47c92b6200
-s ours
Change-Id: Icca1344e8aca687cb67c0c5f565d31566f95530a
2017-08-22 17:13:24 +00:00
Adam Seaton
acc7e47faa
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 am: cf83f5a4f3
-s ours
...
am: b40465ed59
Change-Id: I224a4a9470e5666e1004dac3ce0d45d9e609ff04
2017-08-22 17:10:26 +00:00
Adam Seaton
47c92b6200
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1
...
am: dafd187ab5
Change-Id: I83be94f8d716154b7c235f44bb8c2c63a38f4b62
2017-08-22 17:10:25 +00:00
Adam Seaton
b40465ed59
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113
...
am: cf83f5a4f3
-s ours
Change-Id: Id397af75994a345ab0f92d4ccad5b82732d51c3e
2017-08-22 17:07:54 +00:00
Adam Seaton
dafd187ab5
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113
...
am: f2f5343ba1
Change-Id: I8d79367624f8e1f8fe0e52374521b55f49e9ec83
2017-08-22 17:06:25 +00:00
Adam Seaton
21a54abbad
[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113
2017-08-21 11:15:21 -07:00
Adam Seaton
cf83f5a4f3
[DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113
2017-08-21 11:08:37 -07:00
Adam Seaton
f2f5343ba1
[Do Not Merge] Update platform security string to 2017-10-01 in KLP dev
...
Bug:64896113
2017-08-21 10:52:18 -07:00
Adam Seaton
2d28e0372a
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6
am: 60d6fe7552
...
am: cfbb865e29
Change-Id: Idb5c1e9cc98cf9e235eaf4de07a94c26eec3455a
2017-07-20 21:10:44 +00:00
Adam Seaton
cfbb865e29
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6
...
am: 60d6fe7552
Change-Id: I22072a5a682601a1561f78284d99d2d3953d5dff
2017-07-20 21:04:14 +00:00
Adam Seaton
60d6fe7552
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev
...
am: 65b4d916e6
Change-Id: Ib983d0c46cbe3de3a57da7ec1b128dbe8eeb5627
2017-07-20 20:57:44 +00:00
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
f01d7163e8
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 am: 451a9d73bf
am: d3789031c9
...
am: 35f0f8df33
Change-Id: Id933801acd73721eeb734ede7d7e766927d361f2
2017-07-19 22:23:47 +00:00
Adam Seaton
35f0f8df33
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 am: 451a9d73bf
...
am: d3789031c9
Change-Id: I27d36cb130edbdc8e98ec59a19192f6d111efb1e
2017-07-19 22:20:47 +00:00
Adam Seaton
d3789031c9
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
...
am: 451a9d73bf
Change-Id: Id8b2531e63cdf9a8c21249d313abda258c014363
2017-07-19 22:18:21 +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
0d6f9c4f2a
[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 am: b8d42f935a
am: effbf4f539
...
am: 131dfae90d
Change-Id: I6a2181a090e456120f11813309115c7cbeedfa48
2017-07-19 21:04:41 +00:00
Adam Seaton
131dfae90d
[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 am: b8d42f935a
...
am: effbf4f539
Change-Id: I4710a94c8758dd9f2ec1dcd8a06a51ba1ba85158
2017-07-19 21:02:10 +00:00
Adam Seaton
effbf4f539
[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
...
am: b8d42f935a
Change-Id: Id7f8f21fd719ad39b22216c8e99bf28629ac3cb0
2017-07-19 20:59:40 +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
16af70a949
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360
am: f5c749c512
...
am: def58d6dec
Change-Id: I766d7eb612200e0ae9f6ae3eabf9bab92c152cb1
2017-05-23 17:36:16 +00:00
Adam Seaton
def58d6dec
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360
...
am: f5c749c512
Change-Id: I363d1ce470f0d44caf1c12d4843d0f84a87b6f59
2017-05-23 17:34:13 +00:00
Adam Seaton
f5c749c512
Merge changes Id4d040ea,I318fb1fc into mnc-dev
...
am: a2603bd360
Change-Id: Ia22d1824913e82550dae44a799cb9da4c7344949
2017-05-23 17:32: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
5482ef4491
[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 am: 025c26de91
am: 5868fb70b3
...
am: 90028cf69a
Change-Id: I8804295956083b6f6a8bf01b08ec8085b3e068d4
2017-05-19 19:40:37 +00:00