Commit Graph

29541 Commits

Author SHA1 Message Date
Adam Seaton 73452ebcd6 Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949 -s ours am: 2f755b5466 am: ffb37ffc45
am: 9e9542d085

Change-Id: I3cf67cbf1300add3484892b555f6e1a474802039
2017-05-23 20:35:30 +00:00
Adam Seaton 9e9542d085 Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949 -s ours am: 2f755b5466
am: ffb37ffc45

Change-Id: I59936b65e75bf79aad233500bcb0ab4a6faf1bdd
2017-05-23 20:33:00 +00:00
Adam Seaton e11f92cdb3 Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84d9 am: c1b0be15c4
am: e01e278881  -s ours

Change-Id: I865b1e32176c2b9c499115bea22b13218322dda5
2017-05-23 20:30:30 +00:00
Adam Seaton ffb37ffc45 Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949 -s ours
am: 2f755b5466

Change-Id: I9bd233385bb5dbe765bc3ba64ef65c1e467c4aac
2017-05-23 20:30:30 +00:00
Adam Seaton 2f755b5466 Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec
am: 16af70a949  -s ours

Change-Id: I716702080e330b73d3e343e892949e488b0f54be
2017-05-23 20:27:58 +00:00
Adam Seaton e01e278881 Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84d9
am: c1b0be15c4

Change-Id: I2ad666aa08ece76294f80857f94356c696242a4d
2017-05-23 17:38:43 +00:00
Adam Seaton c1b0be15c4 Merge changes I46d9d8c1,I1ea15c14 into nyc-dev
am: 95f77a84d9

Change-Id: I63baa7afd38cd6c3d6852be930aa64df74bb975d
2017-05-23 17:36:16 +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 95f77a84d9 Merge changes I46d9d8c1,I1ea15c14 into nyc-dev
* changes:
  [DO NOT MERGE]Updating security string to 2017-07-05 on nyc-dev bug:38342695
  [DO NOT MERGE]Updating security string to 2017-07-01 on nyc-dev bug:38342695
2017-05-23 17:29:00 +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 3f08725f86 [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 am: 5482ef4491 -s ours am: fc30cdc480 am: 04b0eb600b
am: 9f80f090a8  -s ours

Change-Id: Ic375882bc160265728515b8553041f7031744738
2017-05-19 19:47:36 +00:00
Adam Seaton 9f80f090a8 [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 am: 5482ef4491 -s ours am: fc30cdc480
am: 04b0eb600b

Change-Id: Ib890f67a07c1ee998420e0d2a73bdaa02aa1828f
2017-05-19 19:45:39 +00:00
Adam Seaton 04b0eb600b [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 am: 5482ef4491 -s ours
am: fc30cdc480

Change-Id: Ib999be3acd32afc13859e7fb49352cf23452dc91
2017-05-19 19:44:08 +00:00
Adam Seaton fc30cdc480 [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
am: 5482ef4491  -s ours

Change-Id: I26bebc5e9dd4a3e04af3767970c323a310f1b16f
2017-05-19 19:42:06 +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
Adam Seaton 90028cf69a [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

Change-Id: I14f5bcd5373daa4b17d82f71bb873fef2b80ff12
2017-05-19 19:38:36 +00:00
Adam Seaton 5868fb70b3 [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

Change-Id: Iedb9b5e111975a9372d35f790464ff553d3c11d9
2017-05-19 19:36:37 +00:00
Adam Seaton 588a0f8523 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 am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409 -s ours am: 6a94730d20 am: 70accb9b43
am: 974d64ee8f  -s ours

Change-Id: I448dd5be384ecd58e8a3ceb05d1c9c1a5713b53f
2017-05-19 19:35:26 +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 0ac3704512 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 am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours am: 288fd15d69 am: 701dc24fb9
am: 75864440c3  -s ours

Change-Id: I358507c9526f70125bf28b5af87f9bfaa9e867fa
2017-05-19 19:35:05 +00:00
Adam Seaton 974d64ee8f 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 am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409 -s ours am: 6a94730d20
am: 70accb9b43

Change-Id: I62e008a1e018893cb5ddf7201d92343f67942912
2017-05-19 19:33:25 +00:00
Adam Seaton 75864440c3 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 am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours am: 288fd15d69
am: 701dc24fb9

Change-Id: I6e6185d1640ff6fd18122763e94fc637453ccaad
2017-05-19 19:33:06 +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 70accb9b43 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 am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409 -s ours
am: 6a94730d20

Change-Id: I505e20e71ccc2fc4f594300b3b94c45fb1e5c8a2
2017-05-19 19:31:29 +00:00
Adam Seaton 701dc24fb9 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 am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours
am: 288fd15d69

Change-Id: I5dc3408114f58145810c33111b15d4d40e7a3835
2017-05-19 19:31:06 +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 6a94730d20 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 am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d
am: e10ce80409  -s ours

Change-Id: I62e3792b2aef5064d04d488c5ca631d0a0631e58
2017-05-19 19:29:29 +00:00
Adam Seaton 288fd15d69 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 am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8
am: 3f5593376d  -s ours

Change-Id: I7b94b0638f33d133ea45d69986ac853b613d4f44
2017-05-19 19:29: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 e10ce80409 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 am: 9f169ddbcd am: 5c7bac6231
am: 1899a63f1d

Change-Id: Ib018b81b77ca749333a4700049a525523e2f83c1
2017-05-19 19:27:37 +00:00
Adam Seaton 3f5593376d 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 am: 7ad3c1407c am: 16dcd532a0
am: 535ade48f8

Change-Id: I3c084d863cb3b091c0e7ebf7783969c9c7125fa1
2017-05-19 19:27:05 +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 1899a63f1d 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 am: 9f169ddbcd
am: 5c7bac6231

Change-Id: Idc1d79faa12fdd938f57e1678fbb34bbbc9c6bcd
2017-05-19 19:26:00 +00:00
Adam Seaton 535ade48f8 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 am: 7ad3c1407c
am: 16dcd532a0

Change-Id: Ic6b017fd04b00a2cf65336e76386d94cabc8b13a
2017-05-19 19:25:36 +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 5c7bac6231 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
am: 9f169ddbcd

Change-Id: I9d563934bf1454022707c9f55f4d97e92ce077d0
2017-05-19 19:22:26 +00:00
Adam Seaton 16dcd532a0 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
am: 7ad3c1407c

Change-Id: I8564bba5201302290fdca4d3350d0cbc7a97ac7b
2017-05-19 19:22:05 +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 ff461ef52c [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 am: 2e17d83fcd am: 18e5f9b4f6 am: 7d58605e6b am: ad860c3d0d -s ours am: ee22290a47 am: 7b94aecada
am: 7fe1da4f84  -s ours

Change-Id: I87ff26565bbe4fbf92bc9581c5cb42b0a7ef35b3
2017-05-19 19:18:33 +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 7fe1da4f84 [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 am: 2e17d83fcd am: 18e5f9b4f6 am: 7d58605e6b am: ad860c3d0d -s ours am: ee22290a47
am: 7b94aecada

Change-Id: I5282c826869ad17bfafd809d92514d20cab4e3a9
2017-05-19 19:16:36 +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 7b94aecada [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 am: 2e17d83fcd am: 18e5f9b4f6 am: 7d58605e6b am: ad860c3d0d -s ours
am: ee22290a47

Change-Id: I29104f6178234b5d41a692b3d7546319f726a5ef
2017-05-19 19:14:35 +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
Adam Seaton ee22290a47 [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 am: 2e17d83fcd am: 18e5f9b4f6 am: 7d58605e6b
am: ad860c3d0d  -s ours

Change-Id: Ia4e120c452a58d96125dd1263cd13809230e5f50
2017-05-19 19:12: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