Commit graph

43997 commits

Author SHA1 Message Date
Paul Scovanner
0718f458a1 Update Security String to 2019-07-05
Bug:132634503
2019-05-14 00:02:43 +00:00
Paul Scovanner
95bee0f53e Update Security String to 2019-07-01
Bug:132634503
2019-05-13 20:36:29 +00:00
Paul Scovanner
593be3c494 Update Security String to 2019-06-05 Bug:129374896 Merged-In: 2c26c3d4c0 am: 3ae4e858b7 am: cce67c52c9
am: e90b407c2f

Change-Id: I451be3f8467540539c00be5d02798be830f89ff1
2019-04-12 20:54:41 -07:00
Paul Scovanner
e90b407c2f Update Security String to 2019-06-05 Bug:129374896 Merged-In: 2c26c3d4c0 am: 3ae4e858b7
am: cce67c52c9

Change-Id: Iad4a6c33c50cc2fd213a6a207c920ee540ae1c43
2019-04-12 20:25:15 -07:00
Paul Scovanner
cce67c52c9 Update Security String to 2019-06-05 Bug:129374896 Merged-In: 2c26c3d4c0
am: 3ae4e858b7

Change-Id: I02ef18033096d4e6d22f0eb945b4b630104e4609
2019-04-12 19:35:43 -07:00
Paul Scovanner
3ae4e858b7 Update Security String to 2019-06-05
Bug:129374896
Merged-In: 2c26c3d4c0
2019-04-12 18:40:01 +00:00
Paul Scovanner
ac3ae589d5 Merge changes from topic "am-25a1f704-80e7-4c0b-a6ef-9bda09527573" into oc-dev am: e95d55db1c am: b293d74a3c
am: c7c7763e18

Change-Id: Ib492d6c7909b92d07da1c9cb406deeac9094b162
2019-04-09 15:46:01 -07:00
Paul Scovanner
91441ca650 [automerger skipped] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 Merged-In:1f8f84de6133f82df8210fa9214475d7c5aaa2f0 am: 3e8a1393a7 am: 9231b34069
am: ee14e56c76 -s ours
am skip reason: subject contains skip directive

Change-Id: I270f4711add802057ccd3fe0327ca5691ea62a5a
2019-04-09 15:44:39 -07:00
Paul Scovanner
c7c7763e18 Merge changes from topic "am-25a1f704-80e7-4c0b-a6ef-9bda09527573" into oc-dev am: e95d55db1c
am: b293d74a3c

Change-Id: I5312b7e1ff9d3558ab9c051dc34ab34ff9c4ea92
2019-04-09 14:22:23 -07:00
Paul Scovanner
ee14e56c76 [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 Merged-In:1f8f84de6133f82df8210fa9214475d7c5aaa2f0 am: 3e8a1393a7
am: 9231b34069

Change-Id: Iee0d3857d653ffed9888b742535008c781577adc
2019-04-09 14:21:09 -07:00
Paul Scovanner
b293d74a3c Merge changes from topic "am-25a1f704-80e7-4c0b-a6ef-9bda09527573" into oc-dev
am: e95d55db1c

Change-Id: Ie4e72858b9c41aedad54b82f4b65289132370c10
2019-04-09 13:22:43 -07:00
Paul Scovanner
9231b34069 [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 Merged-In:1f8f84de6133f82df8210fa9214475d7c5aaa2f0
am: 3e8a1393a7

Change-Id: I2a8ce7b192ccb2bbf23c342c88da45d9c3b3f070
2019-04-09 13:06:43 -07:00
Paul Scovanner
e95d55db1c Merge changes from topic "am-25a1f704-80e7-4c0b-a6ef-9bda09527573" into oc-dev
* changes:
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea am: ef4f971f0a skipped: 04ba31ff57
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea am: ef4f971f0a
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a
  [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896
2019-04-09 18:54:57 +00:00
Paul Scovanner
0ad5c1fe8b Merge "[DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896" into pi-dev 2019-04-09 18:50:22 +00:00
Paul Scovanner
3e8a1393a7 [DO NOT MERGE] Update Security String to 2019-06-01
Bug:129374896
Merged-In:1f8f84de6133f82df8210fa9214475d7c5aaa2f0
2019-04-08 21:48:10 +00:00
Paul Scovanner
9c6046fb32 [automerger skipped] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896
am: 1f8f84de61 -s ours
am skip reason: subject contains skip directive

Change-Id: I4dadebf0c3215c7c3aa8ec019d2cccdf8e5c6b07
2019-04-08 14:34:03 -07:00
Paul Scovanner
1f8f84de61 [DO NOT MERGE] Update Security String to 2019-06-01
Bug:129374896
2019-04-08 18:01:43 +00:00
Paul Scovanner
2db03695f4 [DO NOT MERGE] Update Security String to 2019-06-01
Bug:129374896
2019-04-05 23:32:13 +00:00
Android Build Merger (Role)
c9025d9833 [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea am: ef4f971f0a skipped: 04ba31ff57
Change-Id: I465e072206cdc9727df1d7cd1f71b4f8f5ef7d38
2019-04-05 21:22:23 +00:00
Android Build Merger (Role)
04ba31ff57 [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea am: ef4f971f0a
Change-Id: I6e36aef2c3c3307fcf2a34d5b71dccae5fb217a1
2019-04-05 21:22:21 +00:00
Android Build Merger (Role)
ef4f971f0a [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea
Change-Id: I85f6511f1258aa33b9df20c42d58ea624a95130e
2019-04-05 21:22:19 +00:00
Android Build Merger (Role)
41611b89ea [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648
Change-Id: I107595082da3470de9968e54ed4439ec4ca1e7da
2019-04-05 21:22:17 +00:00
Android Build Merger (Role)
f3e105e648 [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a
Change-Id: If24a508f5a46ac7b82458721ab5b715d7c863dc7
2019-04-05 21:22:15 +00:00
Paul Scovanner
bcdb638d6a [DO NOT MERGE] Update Security String to 2019-06-01
Bug:129374896
2019-04-05 21:22:12 +00:00
Adam Seaton
3d75a015a2 [automerger skipped] [Do Not Merge] Update Platform Security String to 2019-05-05 for oc-mr1-dev Bug:128322951
am: 796d90c141 -s ours
am skip reason: subject contains skip directive

Change-Id: I088058f32b6e2a990e1f4f6db432ed74adde43a6
2019-03-11 15:52:56 -07:00
TreeHugger Robot
53a4d16512 Merge "[DO NOT MERGE] Update Platform Security string to 2019-05-05 for Pi-dev Bug:128322951" into pi-dev 2019-03-11 22:31:32 +00:00
Elisa Pascual Trevino
d6e24caa47 [automerger skipped] [DO NOT MERGE] Update Security String to 2019-05-01 in oc-mr1-dev Bug: 128322951
am: 801e91776e -s ours
am skip reason: subject contains skip directive

Change-Id: Ia74fdd88bdd94c15f639685615ae4700f44fa870
2019-03-11 14:12:07 -07:00
Adam Seaton
796d90c141 [Do Not Merge] Update Platform Security String to 2019-05-05 for oc-mr1-dev
Bug:128322951
2019-03-11 20:50:55 +00:00
Adam Seaton
7d44fc8d59 [DO NOT MERGE] Update Platform Security string to 2019-05-05 for Pi-dev
Bug:128322951
2019-03-11 20:46:28 +00:00
Elisa Pascual Trevino
801e91776e [DO NOT MERGE] Update Security String to 2019-05-01 in oc-mr1-dev
Bug: 128322951
2019-03-11 18:06:15 +00:00
Elisa Pascual Trevino
1159bb8b17 [DO NOT MERGE] Update Security String to 2019-05-01 in pi-dev
Bug: 128322951
2019-03-11 17:58:20 +00:00
Adam Seaton
8d68f91aad [automerger skipped] [DO NOT MERGE] Update platform security string to 2019-04-01 on oc-mr1-dev Bug:124119313
am: 7d7a3cbcc8 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifedac1475497c66faad15d3ecbfe53bf22aee86b
2019-02-19 15:06:15 -08:00
Adam Seaton
7d7a3cbcc8 [DO NOT MERGE] Update platform security string to 2019-04-01 on oc-mr1-dev
Bug:124119313
2019-02-19 18:49:09 +00:00
Elisa Pascual Trevino
0b5a344dc3 Update Security String to 2019-04-05
Bug: 124119313
2019-02-08 21:28:23 +00:00
Elisa Pascual Trevino
f9835d9f4d Update Security String to 2019-04-01
Bug: 124119313
2019-02-08 20:57:15 +00:00
Adam Seaton
2407488402 [automerger skipped] [DO NOT MERGE] Update Platform Security String to 2019-03-05 for oc-mr1-dev Bug:122541777
am: eb164e06b2 -s ours
am skip reason: subject contains skip directive

Change-Id: I2a0c2fd0b4f41cca9c70a39ede401ad57078eb98
2019-01-15 14:03:53 -08:00
Adam Seaton
eb164e06b2 [DO NOT MERGE] Update Platform Security String to 2019-03-05 for oc-mr1-dev Bug:122541777 2019-01-15 19:14:22 +00:00
Adam Seaton
ecc2061991 [automerger skipped] Merge "[DO NOT MERGE] Update Platform Security String to 2019-03-01 for oc-mr1-dev Bug:122541777" into oc-mr1-dev
am: 7e8e840f61 -s ours
am skip reason: subject contains skip directive

Change-Id: I374ecfe2d7bb7e726dbbb1338c643469340c96e9
2019-01-14 18:15:32 -08:00
TreeHugger Robot
7e8e840f61 Merge "[DO NOT MERGE] Update Platform Security String to 2019-03-01 for oc-mr1-dev Bug:122541777" into oc-mr1-dev 2019-01-15 01:52:09 +00:00
Adam Seaton
e46ada4f23 [automerger skipped] [automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6 am: e56e5efec9 am: 87877d530a am: 33ecfffc1f skipped: 440db90921 am: ed56062889 am: f583da6005
am: 04bc1f36da -s ours
am skip reason: subject contains skip directive

Change-Id: I6bcfe95c949d7d573eb10482f5e9694df53065e8
2019-01-14 17:25:44 -08:00
Adam Seaton
04bc1f36da [automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6 am: e56e5efec9 am: 87877d530a am: 33ecfffc1f skipped: 440db90921 am: ed56062889
am: f583da6005

Change-Id: I9002810c0569b91ea6e17c84afaa798c84490fe1
2019-01-14 17:18:27 -08:00
Adam Seaton
f583da6005 [automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6 am: e56e5efec9 am: 87877d530a am: 33ecfffc1f skipped: 440db90921
am: ed56062889

Change-Id: Ia7158b31b505312b079622e95394ca0cf9f56e99
2019-01-14 17:09:54 -08:00
Adam Seaton
6698efad06 [DO NOT MERGE] Update Platform Security String to 2019-03-01 for oc-mr1-dev Bug:122541777 2019-01-14 22:21:01 +00:00
Android Build Merger (Role)
ed56062889 [automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6 am: e56e5efec9 am: 87877d530a am: 33ecfffc1f skipped: 440db90921
Change-Id: I01f14495a15278d3e4a9b753be3c323eb596f24e
2019-01-08 22:45:33 +00:00
Android Build Merger (Role)
440db90921 [automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6 am: e56e5efec9 am: 87877d530a am: 33ecfffc1f
Change-Id: I4268b17fbd7e064dd5c1a77048ef238ce2eb3075
2019-01-08 22:45:32 +00:00
Android Build Merger (Role)
33ecfffc1f [automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6 am: e56e5efec9 am: 87877d530a
Change-Id: Ic4324df9733bd6dec37aad0f2218c0a7a4fe6dc5
2019-01-08 22:45:30 +00:00
Android Build Merger (Role)
87877d530a [automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6 am: e56e5efec9
Change-Id: Ic9d5eacd39787d9365523b1cea2c7c49b2eb88bc
2019-01-08 22:45:28 +00:00
Android Build Merger (Role)
e56e5efec9 [automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6
Change-Id: I56938b60fddafa46970e6a45fffc48cbcd34434d
2019-01-08 22:45:27 +00:00
Adam Seaton
7a403979d6 [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 2019-01-08 22:45:25 +00:00
Adam Seaton
ac6eac206d Update Platform Security String to 2019-03-05 for pi-dev Bug:122541777 2019-01-08 14:29:43 -08:00