Commit graph

823 commits

Author SHA1 Message Date
Xin Li
622e8fb529 Merge QQ3A.200805.001
Bug: 162879794
Merged-In: I5f0b271fb5302e8c72024b49fb1a2ae5120821e0
Change-Id: I47416909bc0c43e8c2fbf14087153802a1aa3b29
2020-08-05 17:38:39 +00:00
Bill Yi
a4d40c35a9 Merge android10-qpr3-release to aosp-master - DO NOT MERGE
Merged-In: I05e3e332007665f72a97b217a3e829441f87f811
Change-Id: I1119b2533299f722e1c8b7faa369925168024d25
2020-07-07 06:27:51 +00:00
Paul Scovanner
89ee431429 Update Security String to 2020-08-05
Bug: 158587413
Change-Id: I5f0b271fb5302e8c72024b49fb1a2ae5120821e0
(cherry picked from commit d4b7f4de4b)
2020-06-10 23:42:56 +00:00
Paul Scovanner
e620a0b2d7 Update Security String to 2020-08-01
Bug: 158587413
Change-Id: I21b16ed52ef9c7c26a671692c66b06855b147b16
(cherry picked from commit a4d5641a34)
2020-06-10 00:35:26 +00:00
Paul Scovanner
fd026aa120 Update Security String to 2020-07-05
Bug: 156652977
Change-Id: Ifee743bae79d21c096a95d608552fbb4260aff6c
(cherry picked from commit 902a6e18e0)
2020-05-18 01:28:01 +00:00
Paul Scovanner
e9c6d7d330 Update Security String to 2020-07-01
Bug: 156652977
Change-Id: I81539bf9bd96bdc2e0bca54b506d8a6061f0bfba
(cherry picked from commit 4a475b4740)
2020-05-17 21:09:40 +00:00
Xin Li
62ebb9454e DO NOT MERGE - Merge QQ3A.200605.002 into stage-aosp-master
Bug: 155771477
Change-Id: Iea80d9cdc27c7109d848f9fc2350aecf5da75ece
Merged-In: I115a68d442f4f3922f0353fae1aae3bf1c057903
2020-05-16 17:30:34 +00:00
Dan Willemsen
104cf995cc Merge "Master is now S" am: 19096a2479
Change-Id: I7b6a39f95f837e328f49a5526c440266d4be1ae3
2020-05-04 07:12:00 +00:00
Dan Willemsen
19096a2479 Merge "Master is now S" 2020-05-04 06:58:10 +00:00
Jooyung Han
ecb1cbf481 Merge "Remove PLATFORM_VERSION_FUTURE_CODENAMES" am: 10644f1485
Change-Id: I89ed97e7b3c6755c3620173cc05dd3f53bcb1d76
2020-04-14 04:21:42 +00:00
Jooyung Han
7fcd3b36ee Remove PLATFORM_VERSION_FUTURE_CODENAMES
It has been wrong to split ALL_VERSIONS into exclusive two sets of
before/after TARGET_PLATFORM_VERSION.

And PLATFORM_VERSION_ALL_CODENAMES supports all *active* list of
non-finalized codenames.

Bug: 152960049
Test: m
Merged-In: I1e87206a7f261e587cf079cb6b7025ca16aa4fe4
Change-Id: I1e87206a7f261e587cf079cb6b7025ca16aa4fe4
(cherry picked from commit abe575d17b)

Exempt-From-Owner-Approval: cp from master
Change-Id: I1e87206a7f261e587cf079cb6b7025ca16aa4fe4
2020-04-14 02:06:19 +00:00
Paul Scovanner
609eb2ae7b Update Security String to 2020-06-05
Bug: 153882927

Change-Id: I115a68d442f4f3922f0353fae1aae3bf1c057903
(cherry picked from commit a52a320ffd)
2020-04-14 01:03:02 +00:00
Paul Scovanner
ae9b194cee Update Security String to 2020-06-01
Bug: 153882927

Change-Id: Ibae64bd6c82ddb1afc801550fd7c4ac7bceeb4cc
(cherry picked from commit 388e683934)
2020-04-13 23:18:18 +00:00
Dan Willemsen
4fb98e9d58 Master is now S
Bug: 150754986
Test: treehugger
Change-Id: Icf910c950b5bee32fc04db3b1e61251a5706c109
Merged-In: Icf910c950b5bee32fc04db3b1e61251a5706c109
2020-04-10 05:19:35 +00:00
Xin Li
4e8f40a307 DO NOT MERGE - Merge QQ2A.200405.005 into master
Bug: 150877681
Change-Id: I5e36c453de41b16cf722454edb21428cfd3b759c
Merged-In: Ic383f938d12f9fac0d93364ba737f0c401fb0a01
Merged-In: I4e5b07e96a1ddc23057b373a1ff7d9f54ae361bb
2020-04-08 03:39:21 +00:00
Paul Scovanner
14f7fd1350 Update Security String to 2020-05-05 am: 776c7293fa
Change-Id: Ib4763e7f1914117dc9616fe3edd38d7f889d904e
2020-03-19 17:32:17 +00:00
Paul Scovanner
776c7293fa Update Security String to 2020-05-05
Bug: 151752725
Change-Id: I4393eea75a53f90e23a53020b4a551228564e3cc
2020-03-19 04:40:18 +00:00
Paul Scovanner
b4f6f1f47e Update Security String to 2020-05-01 am: db9b1bd6fd
Change-Id: If276a6bf2c9b4293cad7dfa835553a87082b84f6
2020-03-18 23:25:47 +00:00
Paul Scovanner
db9b1bd6fd Update Security String to 2020-05-01
Bug: 151752725
Change-Id: Ief4b514032bfad1fad1a81c68b4f5e360569f105
2020-03-17 20:47:21 +00:00
Xin Li
51e18647ba DO NOT MERGE - Merge QQ2A.200305.003 into stage-aosp-master
Bug: 150410372
Change-Id: I09b3a138aa19a34400a7dfc8ef60dc52bae4c492
Merged-In: I89aaa622a1aa3a58cb6c35206be9244166f6ca84
2020-02-28 21:34:35 +00:00
Paul Scovanner
b5b9163ea9 Update Security String to 2020-04-05
Bug:149240442
(cherry picked from commit d451ad7167)

Change-Id: I8f17591378e2ee8f2bf42d94de4d220f472da1ae
2020-02-11 23:56:57 +00:00
Paul Scovanner
ea529bd138 Update Security String to 2020-04-01
Bug:149240442
(cherry picked from commit f9edfe3714)

Change-Id: I70ca2967a445b099f2938ff2f4eb5444bd0a283d
2020-02-11 19:06:33 +00:00
Automerger Merge Worker
fcfd5b554a Update Security String to 2020-04-05 am: d451ad7167
Change-Id: I4e5b07e96a1ddc23057b373a1ff7d9f54ae361bb
2020-02-11 17:51:51 +00:00
Automerger Merge Worker
611d93a988 Update Security String to 2020-04-01 am: f9edfe3714
Change-Id: I6949123a1bddcab72e0d918338b44799ec9652e7
2020-02-11 00:27:28 +00:00
Paul Scovanner
d451ad7167 Update Security String to 2020-04-05
Bug:149240442
2020-02-11 00:13:07 +00:00
Paul Scovanner
f9edfe3714 Update Security String to 2020-04-01
Bug:149240442
2020-02-10 21:45:49 +00:00
Paul Scovanner
62e01138c0 Update Security String to 2020-03-05
Bug:147450082
(cherry picked from commit 20c6e7dbe1)

Change-Id: If91cd1ba76ca9ce141bf10eff9df71ceb555518d
2020-01-14 01:40:01 +00:00
Automerger Merge Worker
6f3ffa6128 Update Security String to 2020-03-05 am: 20c6e7dbe1
Change-Id: I89aaa622a1aa3a58cb6c35206be9244166f6ca84
2020-01-14 01:28:53 +00:00
Automerger Merge Worker
bcaf4bd93c Update Security String to 2020-03-01 am: 436b42a079
Change-Id: Iad3d14548ea426fbb321be2f4b5ee9be93687d93
2020-01-10 23:25:28 +00:00
Paul Scovanner
20c6e7dbe1 Update Security String to 2020-03-05
Bug:147450082
2020-01-10 23:13:40 +00:00
Paul Scovanner
436b42a079 Update Security String to 2020-03-01
Bug:147450082
2020-01-10 19:30:07 +00:00
Automerger Merge Worker
e8167c6a87 Merge "Update Security String to 2020-02-05 bug:146378789" into qt-qpr1-dev am: ef94d3e0aa
Change-Id: Icbcecbffecb70edfb14b1f6d4c627bf5febe0e55
2019-12-18 08:26:00 +00:00
Lubo Hristov
9b687f04ca Update Security String to 2020-02-05
bug:146378789
2019-12-18 05:34:05 +00:00
Automerger Merge Worker
dfbb15476f Update Security String to 2020-02-01 bug:146378789 am: 82e8e79390
Change-Id: I9cae45d8b840964d52c56ce703ea3ff2c3225a36
2019-12-17 03:14:18 +00:00
Lubo Hristov
82e8e79390 Update Security String to 2020-02-01 bug:146378789 2019-12-16 16:05:44 -08:00
Lubo Hristov
466c8fd3b2 Set SPL to 2020-01-05
am: 12489ad00b

Change-Id: Idb89d6e4dfb1515166add8b72fe526d4572e1a06
2019-11-15 12:23:17 -08:00
Lubo Hristov
5eb7b066a1 Set SPL to 2020-01-01
am: 07e7d6b643

Change-Id: I7e4e99e0da7387b13c94059b7ab1beb98ac47591
2019-11-15 12:23:14 -08:00
Lubo Hristov
12489ad00b Set SPL to 2020-01-05
bug:144373594
2019-11-15 17:22:42 +00:00
Lubo Hristov
07e7d6b643 Set SPL to 2020-01-01
bug:144373594
2019-11-14 05:14:40 +00:00
Lubo Hristov
c8e28a77c2 Merge "Bump SPL to 2019-12-05" into qt-qpr1-dev
am: 7c27fd1e00

Change-Id: I9991042e7666255221db6324ef2771e9a442827b
2019-10-23 16:22:55 -07:00
Lubo Hristov
b2945148d4 Bump SPL to 2019-12-05
bug:141626492
2019-10-13 19:38:43 +00:00
Lubo Hristov
d6428a96e1 Update SPL to 2019-11-05 am: 73aa913b77
am: b7f65383e2

Change-Id: I4daa831fa99078a24422db8995786d737f3fb3f6
2019-09-20 17:14:54 -07:00
Lubo Hristov
c7e5749a9f Update SPL to 2019-11-01 am: 89b18c02ae
am: 43753d19c9

Change-Id: I13c3cc8cca4806dedf6c67be3bba6b0db11b10c7
2019-09-20 14:18:00 -07:00
Lubo Hristov
73aa913b77 Update SPL to 2019-11-05
bug:141272605
2019-09-20 21:00:52 +00:00
Lubo Hristov
89b18c02ae Update SPL to 2019-11-01
bug:141272605
2019-09-19 19:54:07 +00:00
Elliott Hughes
a8cfe0ec57 Merge "Remove macOS special cases pertaining to date(1)."
am: 0b67e41f3f

Change-Id: Ib03100cab82a999208bfb9248bad3ad6208a3cd5
2019-09-12 18:08:00 -07:00
Elliott Hughes
648017c2b8 Remove macOS special cases pertaining to date(1).
Bug: http://b/139450866
Test: builds
Change-Id: Idc6cc19cf1b81b51526a7d2ba78020c6decb0031
2019-09-12 15:04:16 -07:00
Xin Li
8bd576e201 DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
Bug: 139893257
Change-Id: If694d0bc707fe5b9d21f9de1b5846ab9f2096042
2019-08-23 06:48:52 +00:00
Paul Scovanner
b6ef08709f Update Security Strings to 2019-10-05
am: 84633edb22

Change-Id: Id72288336ca859f6f0bde987876d017f0d36b906
2019-08-14 19:25:16 -07:00
Paul Scovanner
84633edb22 Update Security Strings to 2019-10-05
Bug:139434268
Change-Id: I063f0430347d9f1e6ea5a8133204585833ed5ddc
2019-08-14 21:11:01 +00:00