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 |
|
Adam Seaton
|
25eee603c8
|
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
Change-Id: Ifc5eec2c2b43745f0d7bc61a670bc5c4b4cbdece
|
2017-07-20 21:27:45 +00:00 |
|
Adam Seaton
|
0d1b7e183d
|
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
Change-Id: I67a568b3e4c55df2fd57dc5af4ac32f3f037bbc9
|
2017-07-20 21:25:46 +00:00 |
|
Adam Seaton
|
15d200c399
|
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
Change-Id: Ib8dfc0f08e2086b0161d9c7ad122103a95e1a709
|
2017-07-20 21:18:15 +00: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
|
683c44c812
|
Merge changes I7c8a25a2,Ifb32d061 into oc-dev
* changes:
Updating Security String to 2017-09-05 Bug:63846344
Updating Security String to 2017-09-01 Bug:63846344
|
2017-07-20 20:45:01 +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
|
b81e890ef9
|
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 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours am: 50efec7a2c -s ours am: df338dadee -s ours am: a94af85a7d -s ours
am: 4149340d7c -s ours
Change-Id: Iae950b38f0d5ae4870019e4586f42ce81dc33714
|
2017-07-19 22:47:19 +00:00 |
|
Adam Seaton
|
4149340d7c
|
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 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours am: 50efec7a2c -s ours am: df338dadee -s ours
am: a94af85a7d -s ours
Change-Id: I73ca7a9fd67ec1c870675ba4416d650bb0586c23
|
2017-07-19 22:44:17 +00:00 |
|
Adam Seaton
|
6ac9ecd397
|
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 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c am: dbecffb85f
am: c7040501a1 -s ours
Change-Id: Id2d6b7359c54f2a990e4fb8bb4041f1637423092
|
2017-07-19 22:41:18 +00:00 |
|
Adam Seaton
|
a94af85a7d
|
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 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours am: 50efec7a2c -s ours
am: df338dadee -s ours
Change-Id: I73cd2a110a0c0957f7c0c9ea47ff8a6c730d8900
|
2017-07-19 22:41:17 +00:00 |
|
Adam Seaton
|
c7040501a1
|
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 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c
am: dbecffb85f
Change-Id: Iee83fa15644388db9720b17b83ee744130ab77c1
|
2017-07-19 22:38:20 +00:00 |
|
Adam Seaton
|
df338dadee
|
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 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded am: 29c817a61c -s ours
am: 50efec7a2c -s ours
Change-Id: I6d763102767cbaebf6ebb25d5be76e8bbec662b7
|
2017-07-19 22:38:17 +00:00 |
|
Adam Seaton
|
dbecffb85f
|
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 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded
am: 29c817a61c
Change-Id: Ia8c1dfaf4c3d82ed6f2d8b1a63be036d29f41285
|
2017-07-19 22:35:20 +00:00 |
|
Adam Seaton
|
50efec7a2c
|
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 am: f01d7163e8 -s ours am: aec34cff65 am: 8f46ad2ded
am: 29c817a61c -s ours
Change-Id: I287e92310afc3ef1d505b2ee175e0cd1a4071c8a
|
2017-07-19 22:35:17 +00:00 |
|
Adam Seaton
|
29c817a61c
|
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 am: f01d7163e8 -s ours am: aec34cff65
am: 8f46ad2ded
Change-Id: I80f9a4d498b578b608b6bf44f2cfb18a683569d8
|
2017-07-19 22:32:48 +00:00 |
|
Adam Seaton
|
8f46ad2ded
|
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 am: f01d7163e8 -s ours
am: aec34cff65
Change-Id: I2b2716a37e3df0601714d56af89acc6578fc6cf7
|
2017-07-19 22:29:49 +00:00 |
|
Adam Seaton
|
aec34cff65
|
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
am: f01d7163e8 -s ours
Change-Id: I79a827a4da9f2822a1abe972c20f243fee1768db
|
2017-07-19 22:26:18 +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
|
b4682b1f42
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 -s ours am: 6004c810a0 -s ours am: 9c8b857af3 -s ours am: 690b7e9091 -s ours
am: bac9a62680 -s ours
Change-Id: Ib3f24756d379c95db5051491104e8f69ece1fc64
|
2017-07-19 22:20:45 +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
|
bac9a62680
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 -s ours am: 6004c810a0 -s ours am: 9c8b857af3 -s ours
am: 690b7e9091 -s ours
Change-Id: Iba622d08140b22ebdc0ec278b2b518bde15293bd
|
2017-07-19 22:18:15 +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
|
690b7e9091
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 -s ours am: 6004c810a0 -s ours
am: 9c8b857af3 -s ours
Change-Id: I8c3067322ac8218a69827af2b2c258da28c123f9
|
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
|
25d1a95575
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 am: e02f8e490d
am: 1500ea69de -s ours
Change-Id: I266adfc2fb6fefb0353cb3b7017f56729a14774f
|
2017-07-19 22:12:44 +00:00 |
|
Adam Seaton
|
1500ea69de
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3
am: e02f8e490d
Change-Id: If11d5e19433907b331ae5a23c11d8a02454b3384
|
2017-07-19 22:10:15 +00:00 |
|
Adam Seaton
|
9c8b857af3
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3 -s ours
am: 6004c810a0 -s ours
Change-Id: I1e6c08edeca3522c57805bdd54946152951f573d
|
2017-07-19 22:10:14 +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 |
|
Adam Seaton
|
e02f8e490d
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930
am: 6e74bc34e3
Change-Id: I7e7342b3bfcef3018994a559814e341fb9f1a741
|
2017-07-19 22:07:45 +00:00 |
|
Adam Seaton
|
6004c810a0
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930
am: 6e74bc34e3 -s ours
Change-Id: I5d7a7d9ae030bdd37165a2586612daa2e4a06224
|
2017-07-19 22:07:44 +00:00 |
|
Adam Seaton
|
6e74bc34e3
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac
am: 6703815930
Change-Id: I19e49cbd840eceda215ba519cbb6a938947ffcb1
|
2017-07-19 22:04:45 +00:00 |
|
Adam Seaton
|
6703815930
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev
am: 89aa0d18ac
Change-Id: I585ee47ae511338feacf47f32fe6a4c42b2d52d1
|
2017-07-19 22:02:15 +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 |
|
TreeHugger Robot
|
89aa0d18ac
|
Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev
|
2017-07-19 21:56:24 +00:00 |
|
Adam Seaton
|
ec600cb0ec
|
[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 am: 0d6f9c4f2a -s ours am: f15d15e7c7 am: 06e3c7dc42 am: ab1c4fb3c4 -s ours am: 3630da3bdd -s ours am: 24594261ce -s ours am: 4ebd91e5c5 -s ours
am: 763bc1f8a1 -s ours
Change-Id: If2185478612f01d84f945149bab47239afd25dcc
|
2017-07-19 21:27:13 +00:00 |
|
Adam Seaton
|
763bc1f8a1
|
[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 am: 0d6f9c4f2a -s ours am: f15d15e7c7 am: 06e3c7dc42 am: ab1c4fb3c4 -s ours am: 3630da3bdd -s ours am: 24594261ce -s ours
am: 4ebd91e5c5 -s ours
Change-Id: Ieb0a3bcbd31467d46bc1218e64a23da4cb0eabee
|
2017-07-19 21:24:42 +00:00 |
|
Adam Seaton
|
7e96035bb8
|
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1 am: 4b61de46b5 am: 73c3609c53 -s ours am: 1447fa794a -s ours am: 3bf3f53e5e -s ours am: b3e05e6d23 -s ours
am: 87c38ba25e -s ours
Change-Id: I5da55f5d6ea75ac03ccd859abdf485fbeb629df4
|
2017-07-19 21:24:42 +00:00 |
|
Adam Seaton
|
4ebd91e5c5
|
[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 am: 0d6f9c4f2a -s ours am: f15d15e7c7 am: 06e3c7dc42 am: ab1c4fb3c4 -s ours am: 3630da3bdd -s ours
am: 24594261ce -s ours
Change-Id: Icc4f273490a6878f6d407adf88eab459ce64b6b2
|
2017-07-19 21:21:42 +00:00 |
|
Adam Seaton
|
87c38ba25e
|
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1 am: 4b61de46b5 am: 73c3609c53 -s ours am: 1447fa794a -s ours am: 3bf3f53e5e -s ours
am: b3e05e6d23 -s ours
Change-Id: I4440fdb0a8262eed8d7ff0efad94c259b9aa9682
|
2017-07-19 21:21:41 +00:00 |
|