Adam Seaton
cde553f1c5
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f
am: feada74524
am: dbe7ec01c6
am: aed422e05b
...
am: e53cb97dcb
-s ours
Change-Id: I7ba7c371d868bcfc306201ad225982893e5b2f40
2017-08-23 16:57:04 +00:00
TreeHugger Robot
ce4bc47c74
Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev
2017-08-22 22:26:48 +00:00
TreeHugger Robot
fce94e0000
Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev
2017-08-22 22:26:42 +00:00
Adam Seaton
e53cb97dcb
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f
am: feada74524
am: dbe7ec01c6
...
am: aed422e05b
Change-Id: Ifd6a64c599d045735f0c85595315679887310f18
2017-08-22 18:33:33 +00:00
Adam Seaton
aed422e05b
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f
am: feada74524
...
am: dbe7ec01c6
Change-Id: Ic825ad705088aa62974c4a654b149f06f4b1f848
2017-08-22 18:31:34 +00:00
Adam Seaton
dbe7ec01c6
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f
...
am: feada74524
Change-Id: Ia70e8bd5134e5898dcd9cdf4482e534ade45c718
2017-08-22 18:29:02 +00:00
Adam Seaton
feada74524
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev
...
am: e39fa5ef8f
Change-Id: I5918c7dfe27bb9b3c7aff031d79d961b08c3b711
2017-08-22 18:26:04 +00:00
TreeHugger Robot
e39fa5ef8f
Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev
...
* changes:
[DO NOT MERGE] Update platform security string to 2017-10-05 in nyc-dev Bug:64896113
[DO NOT MERGE] Update platform security string to 2017-10-01 in nyc-dev Bug:64896113
2017-08-22 18:19:20 +00:00
Adam Seaton
2633357494
[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
am: 09ec3bc311
-s ours am: 9dbcf7c176
am: 3eac316736
am: 319003c0d8
am: 2b7d9b23c7
...
am: ce869d6025
-s ours
Change-Id: I7bdc25b49ce56f913ba02ce3f2a1ffb8a3ff3d53
2017-08-22 17:52:00 +00:00
Adam Seaton
ce869d6025
[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
am: 09ec3bc311
-s ours am: 9dbcf7c176
am: 3eac316736
am: 319003c0d8
...
am: 2b7d9b23c7
Change-Id: Idda8e5aaf54386d08a6e09b439e60212d4184087
2017-08-22 17:48:02 +00:00
Adam Seaton
2b7d9b23c7
[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
am: 09ec3bc311
-s ours am: 9dbcf7c176
am: 3eac316736
...
am: 319003c0d8
Change-Id: Ice57fa9bb121fb12c3c6a0e29f89e06b7348e07c
2017-08-22 17:42:31 +00:00
Adam Seaton
319003c0d8
[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
am: 09ec3bc311
-s ours am: 9dbcf7c176
...
am: 3eac316736
Change-Id: Iaa4d265c2217402121ed45b51d2eb103c4514f22
2017-08-22 17:39:59 +00:00
Adam Seaton
0693cd362b
[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
am: 7c50949d13
-s ours am: 595b11f9b8
am: dc48c433d5
am: 3dd51fb95a
am: 223d59710e
...
am: 19709747d8
-s ours
Change-Id: I2606d2d5107274299369c0a8ac36723d5a306c98
2017-08-22 17:39:58 +00:00
Adam Seaton
3eac316736
[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
am: 09ec3bc311
-s ours
...
am: 9dbcf7c176
Change-Id: Ibf461a47aa1ebd43414f8a3e10b36c786ca3edac
2017-08-22 17:35:30 +00:00
Adam Seaton
19709747d8
[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
am: 7c50949d13
-s ours am: 595b11f9b8
am: dc48c433d5
am: 3dd51fb95a
...
am: 223d59710e
Change-Id: I475cd7e51097f9915cfbebbeea55fc4ea1b221e3
2017-08-22 17:35:30 +00:00
Adam Seaton
223d59710e
[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
am: 7c50949d13
-s ours am: 595b11f9b8
am: dc48c433d5
...
am: 3dd51fb95a
Change-Id: Ife215f435af3c5d52ab00c036786a3f341728ce0
2017-08-22 17:30:57 +00:00
Adam Seaton
9dbcf7c176
[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
...
am: 09ec3bc311
-s ours
Change-Id: I5fb22683f6e499656cbabd3ae452391fefff1ca9
2017-08-22 17:30:56 +00:00
Adam Seaton
3dd51fb95a
[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
am: 7c50949d13
-s ours am: 595b11f9b8
...
am: dc48c433d5
Change-Id: I5d15a81e60f3ace4612bce83d3b23fce78dd12e4
2017-08-22 17:27:59 +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
dc48c433d5
[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
am: 7c50949d13
-s ours
...
am: 595b11f9b8
Change-Id: I46b088f22247d8801b883b5f57fd38a2c945cfa3
2017-08-22 17:25:28 +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
595b11f9b8
[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
...
am: 7c50949d13
-s ours
Change-Id: Ic87fb7997d16d0ffd53a9c5e0832d315ac641130
2017-08-22 17:23:26 +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
4e140ce86a
Update platform security string to 2017-10-05 in oc-dev Bug:64896113
2017-08-21 11:37:32 -07:00
Adam Seaton
80d3742026
Update platform security string to 2017-10-01 in oc-dev Bug:64896113
2017-08-21 11:36:54 -07:00
Adam Seaton
1517f3d2da
[DO NOT MERGE] Update platform security string to 2017-10-05 in nyc-dev Bug:64896113
2017-08-21 11:26:49 -07:00
Adam Seaton
73ab80dec9
[DO NOT MERGE] Update platform security string to 2017-10-01 in nyc-dev Bug:64896113
2017-08-21 11:26:14 -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
TreeHugger Robot
7740a78495
Merge "Fix potential build break" into oc-dev
2017-07-24 16:50:08 +00:00
Adam Seaton
ff70113263
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6
am: 60d6fe7552
am: cfbb865e29
am: 2d28e0372a
-s ours am: 15d200c399
am: 0d1b7e183d
am: 25eee603c8
-s ours am: a562f661ca
-s ours am: a65c03517e
-s ours am: 1215b2f770
-s ours
...
am: 5c7aef3747
-s ours
Change-Id: Iea1f7cca1c2973b7c761d08ef86d4b601576dd67
2017-07-20 21:38:16 +00:00
Adam Seaton
5c7aef3747
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6
am: 60d6fe7552
am: cfbb865e29
am: 2d28e0372a
-s ours am: 15d200c399
am: 0d1b7e183d
am: 25eee603c8
-s ours am: a562f661ca
-s ours am: a65c03517e
-s ours
...
am: 1215b2f770
-s ours
Change-Id: Id1e28c7a431fa76634aa7ea8010721c3578d75e5
2017-07-20 21:36:19 +00:00
Adam Seaton
54b51dc69a
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6
am: 60d6fe7552
am: cfbb865e29
am: 2d28e0372a
-s ours am: 15d200c399
am: 0d1b7e183d
am: 25eee603c8
am: 19ebbf50a4
...
am: 9f13a87b82
-s ours
Change-Id: I909711741b28cb8e2f2df8339276f3d79fec1e06
2017-07-20 21:34:15 +00:00
Adam Seaton
1215b2f770
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6
am: 60d6fe7552
am: cfbb865e29
am: 2d28e0372a
-s ours am: 15d200c399
am: 0d1b7e183d
am: 25eee603c8
-s ours am: a562f661ca
-s ours
...
am: a65c03517e
-s ours
Change-Id: I5ed187e174d8acfe59076da5af02b1135b1a9955
2017-07-20 21:34:15 +00:00
Adam Seaton
9f13a87b82
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6
am: 60d6fe7552
am: cfbb865e29
am: 2d28e0372a
-s ours am: 15d200c399
am: 0d1b7e183d
am: 25eee603c8
...
am: 19ebbf50a4
Change-Id: I87ae76f73665edf2ba7004aaacb5f7cf27b8b108
2017-07-20 21:32:17 +00:00
Adam Seaton
a65c03517e
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6
am: 60d6fe7552
am: cfbb865e29
am: 2d28e0372a
-s ours am: 15d200c399
am: 0d1b7e183d
am: 25eee603c8
-s ours
...
am: a562f661ca
-s ours
Change-Id: I7d9efb4dcd6f0adfff83cf21df4d4e76cd422526
2017-07-20 21:32:15 +00:00
Adam Seaton
19ebbf50a4
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6
am: 60d6fe7552
am: cfbb865e29
am: 2d28e0372a
-s ours am: 15d200c399
am: 0d1b7e183d
...
am: 25eee603c8
Change-Id: If92333e458ee2f7a31141e1fb72c867ec60c800f
2017-07-20 21:29:46 +00:00
Adam Seaton
a562f661ca
Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6
am: 60d6fe7552
am: cfbb865e29
am: 2d28e0372a
-s ours am: 15d200c399
am: 0d1b7e183d
...
am: 25eee603c8
-s ours
Change-Id: I1e180a225282a3bffe9c47334122f7580b2026a5
2017-07-20 21:29:45 +00:00