Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
659,959 Commits 3 Branches 0 Tags
bcf1533d3091f5de609e5a45bfd5b48e782d1fc7
Commit Graph

659959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Berchet
bcf1533d30 [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours am: 4fea97557a -s ours am: aeecad4897 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I43415d5d125e59e0085ff5b8638970eff7e717c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:01:01 +00:00
Victor Berchet
abc0fd6965 [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours am: 56f74b2e6e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: Id1c455a1c9f5109318455e8f8ed0868e5d9bf6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:00:58 +00:00
Victor Berchet
aeecad4897 [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours am: 4fea97557a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: Ia6d052abd376f352d59fd77d7210f68a2a7e8555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:29:33 +00:00
Victor Berchet
56f74b2e6e [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I5b2dc3b08f41fcc64196de6e94d1d921da0cb8dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:29:32 +00:00
Victor Berchet
4fea97557a [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours am: 83b4fadcb7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I4f8299748dd8971d7b0b4ec978ed64493c21f510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:02:06 +00:00
Victor Berchet
ae0479380a [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I9e265bf6eac9c52fe31f63425fc06147cd3b64ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:01:49 +00:00
Victor Berchet
83b4fadcb7 [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I31a2312fc7520654a27fe3736c55650746c744d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:37:19 +00:00
Victor Berchet
3020cc3897 [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I08f7f5a2b91a7c1a096913f4a083c46e997543e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:37:13 +00:00
Victor Berchet
938c647b7a [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I3201f14b5a79528eec09c5eb5d6d4647d32597d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:13:11 +00:00
Victor Berchet
d93fd9dd8e [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814

Change-Id: I86c387fdcbbc16923d096af5795c168c1a853a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:13:01 +00:00
Victor Berchet
f44dc5cee3 Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev 2022-05-02 21:52:05 +00:00
Victor Berchet
a492c2f2d9 Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" 
This reverts commit 1ca6f8ddb8.

Reason for revert: DroidMonitor: Potential culprit for Bug 231171562 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: Ib5819de2ce4e60deae5676eed9947cbbb759be10
 2022-05-02 20:29:01 +00:00
Wenhao Wang
6c453ab372 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into qt-dev am: 248bbf2dca -s ours am: 7f401aa888 -s ours am: 548bf8cc64 -s ours am: 203de0f0bc -s ours am: b15df33926 -s ours am: 4da2a45338 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17823648

Change-Id: Ifdc8d4fd33871da29482ae5c7467aa8ac442d31b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 19:49:24 +00:00
Wenhao Wang
534197a838 [automerger skipped] [conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6 am: 1ca6f8ddb8 -s ours am: 764c1ec926 -s ours am: 583031670c -s ours am: 0d3014b957 -s ours am: 7db35bb294 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18079441

Change-Id: I1f4889b66c63e086e3dd8d331bc5985ded478dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 19:49:13 +00:00
Wenhao Wang
4da2a45338 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into qt-dev am: 248bbf2dca -s ours am: 7f401aa888 -s ours am: 548bf8cc64 -s ours am: 203de0f0bc -s ours am: b15df33926 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17823648

Change-Id: I8bbc28a17a5d06b46c9a175ecea6c58cda151fc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 19:24:19 +00:00
Wenhao Wang
7db35bb294 [automerger skipped] [conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6 am: 1ca6f8ddb8 -s ours am: 764c1ec926 -s ours am: 583031670c -s ours am: 0d3014b957 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18079441

Change-Id: I9b0ed702618c356a409e6c1abc96d8f7a5b66832
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 19:24:14 +00:00
Wenhao Wang
b15df33926 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into qt-dev am: 248bbf2dca -s ours am: 7f401aa888 -s ours am: 548bf8cc64 -s ours am: 203de0f0bc -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17823648

Change-Id: Iec39543e22ed3a94bf5955079596afe8e8b8d038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 18:57:52 +00:00
Wenhao Wang
0d3014b957 [automerger skipped] [conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6 am: 1ca6f8ddb8 -s ours am: 764c1ec926 -s ours am: 583031670c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18079441

Change-Id: I85fcce746af8013ed9cca302a8db0460334384a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 18:57:30 +00:00
Wenhao Wang
203de0f0bc [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into qt-dev am: 248bbf2dca -s ours am: 7f401aa888 -s ours am: 548bf8cc64 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17823648

Change-Id: I944d361c3735abbc19f881e73c5ec9723f9f1381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 18:06:38 +00:00
Wenhao Wang
583031670c [automerger skipped] [conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6 am: 1ca6f8ddb8 -s ours am: 764c1ec926 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18079441

Change-Id: I986f71ba31b73494acd5bccf7f2e74013ce0c8d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 18:06:28 +00:00
Wenhao Wang
548bf8cc64 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into qt-dev am: 248bbf2dca -s ours am: 7f401aa888 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17823648

Change-Id: Ibe987f2aeb4c39d9f7d9db395b22215e4f017b0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 17:51:04 +00:00
Wenhao Wang
7f401aa888 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into qt-dev am: 248bbf2dca -s ours 
am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 85c00b98a6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17823648

Change-Id: I196db203b04b4c90b7907759f523f1e18aa12f03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 17:44:48 +00:00
Wenhao Wang
764c1ec926 [automerger skipped] [conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6 am: 1ca6f8ddb8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18079441

Change-Id: Ic4a62bdee1f85343228bb6179e3a16433b7c1f6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 17:43:50 +00:00
James Wei
b9642c4f6b [automerger skipped] USB: Increase debounce time for DISCONNECT processing (revised) am: 022e537884 -s ours am: cbad093f2d -s ours 
am skip reason: Merged-In I7ff58a1a9755939ccb26dad61969902ec91f2225 with SHA-1 87bbf2326e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18087662

Change-Id: I0a0c75ffc51d01cd4c17c6b511ae1e72dc14ded3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-30 02:57:52 +00:00
Wenhao Wang
2901d2ec21 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into rvc-dev am: 4228c9bd0c -s ours am: a78e5a9d05 -s ours am: 5027b02797 -s ours am: 4953ebe953 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17874414

Change-Id: I5bbf5fc7a3d3dada8a5a73f14da33ce4274af5c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-30 02:57:45 +00:00
Wenhao Wang
a0a388a505 [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 2e1c70b6b2 -s ours am: 15810f6001 -s ours am: 7584348369 -s ours am: 6c99ec3aaa -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17874414

Change-Id: I1d1cd4a21b907df96a4bdf429897eb5c54d06f8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-30 02:57:36 +00:00
Wenhao Wang
6f42529de5 [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 52bd9bb597 -s ours am: 268fde537d -s ours am: 8f402a8304 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17880608

Change-Id: I5491545a7428e31d05de0b896f9b58d599d4d569
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-30 02:57:25 +00:00
James Wei
5ff1e7f906 [automerger skipped] USB: Increase debounce time for DISCONNECT processing (revised) am: 87bbf2326e -s ours 
am skip reason: Merged-In I7ff58a1a9755939ccb26dad61969902ec91f2225 with SHA-1 615d5d653e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18088282

Change-Id: I39d80e919f62663261b7c4587073d68e108c492f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-30 02:57:17 +00:00
James Wei
cbad093f2d [automerger skipped] USB: Increase debounce time for DISCONNECT processing (revised) am: 022e537884 -s ours 
am skip reason: Merged-In I7ff58a1a9755939ccb26dad61969902ec91f2225 with SHA-1 87bbf2326e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18087662

Change-Id: I23773ddc28c74094f6c1af8a857224a6fa1d33e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-30 02:33:43 +00:00
Wenhao Wang
4953ebe953 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into rvc-dev am: 4228c9bd0c -s ours am: a78e5a9d05 -s ours am: 5027b02797 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17874414

Change-Id: I7edee53b4f671b1c428f7838c96fa0565eed6bac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-30 02:33:35 +00:00
Wenhao Wang
6c99ec3aaa [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 2e1c70b6b2 -s ours am: 15810f6001 -s ours am: 7584348369 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17874414

Change-Id: I3a73752448751f1f91cdc05706c7f2d0e30e7e01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-30 02:33:34 +00:00
Wenhao Wang
8f402a8304 [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 52bd9bb597 -s ours am: 268fde537d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17880608

Change-Id: I3fd8d0fa9ccdbaaef03418a184f07325ac0d4453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-30 02:33:28 +00:00
James Wei
615d5d653e USB: Increase debounce time for DISCONNECT processing (revised) 
Original patch: aosp/1539944

Bug: 207057578
Test: See details in b/209342433
Change-Id: I7ff58a1a9755939ccb26dad61969902ec91f2225
Signed-off-by: James Wei <jameswei@google.com>
(cherry picked from commit 06626cef7a)
Merged-In: I7ff58a1a9755939ccb26dad61969902ec91f2225
 2022-04-29 07:57:43 +00:00
James Wei
87bbf2326e USB: Increase debounce time for DISCONNECT processing (revised) 
Original patch: aosp/1539944

Bug: 207057578
Test: See details in b/209342433
Change-Id: I7ff58a1a9755939ccb26dad61969902ec91f2225
Signed-off-by: James Wei <jameswei@google.com>
(cherry picked from commit 06626cef7a)
Merged-In: I7ff58a1a9755939ccb26dad61969902ec91f2225
 2022-04-29 07:45:57 +00:00
James Wei
022e537884 USB: Increase debounce time for DISCONNECT processing (revised) 
Original patch: aosp/1539944

Bug: 207057578
Test: See details in b/209342433
Change-Id: I7ff58a1a9755939ccb26dad61969902ec91f2225
Signed-off-by: James Wei <jameswei@google.com>
(cherry picked from commit 06626cef7a)
Merged-In: I7ff58a1a9755939ccb26dad61969902ec91f2225
 2022-04-29 07:32:44 +00:00
Wenhao Wang
1ca6f8ddb8 [conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17823648

Change-Id: I248486e7eb6210ba54b30276cfce15a18dc5f9bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 21:00:00 +00:00
Wenhao Wang
5027b02797 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into rvc-dev am: 4228c9bd0c -s ours am: a78e5a9d05 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17874414

Change-Id: I97a854cb9335f9b5480d6de4937802a86b8b872c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:50:55 +00:00
Wenhao Wang
7584348369 [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 2e1c70b6b2 -s ours am: 15810f6001 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17874414

Change-Id: I13c450800893e06352f0d5b300e38a5b9a1c68f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:50:37 +00:00
Wenhao Wang
6fb87bd8a5 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into sc-qpr1-dev am: 06439d0860 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17880724

Change-Id: Ie43289c0263d5edbee58d177cba7932af0e67121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:41:17 +00:00
Wenhao Wang
3506ab2cc7 [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 1f789841fe -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17880724

Change-Id: Ia90c7622629c8d2a8c2148827c99304b2b60b504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:40:54 +00:00
Presubmit Automerger Backend
ba093891a1 [automerger skipped] [automerge] DO NOT MERGE Suppress notifications when device enter lockdown 2p: b1099290b8 am: 018f1c6ce6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17875442

Change-Id: I182375ab3aa34f914fdb33bdce04c0ceabbf6792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:40:34 +00:00
Wenhao Wang
a78e5a9d05 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into rvc-dev am: 4228c9bd0c -s ours 
am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 52bd9bb597 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17874414

Change-Id: I4399a5293675798602da8aedbbd63ddfc1d1dafc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:39:59 +00:00
Wenhao Wang
15810f6001 [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 2e1c70b6b2 -s ours 
am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 52bd9bb597 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17874414

Change-Id: I27d80aec2d2600c0dc4ea53e22c7424593405263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:39:56 +00:00
Wenhao Wang
268fde537d [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 52bd9bb597 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17880608

Change-Id: I09f499ca94d7ae72d6b0e2a99cf9f69afee4cf7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:39:19 +00:00
Wenhao Wang
7c4f648b0f Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into sc-v2-dev 2022-04-28 19:46:33 +00:00
Wenhao Wang
06439d0860 Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into sc-qpr1-dev 2022-04-28 19:46:19 +00:00
Wenhao Wang
4228c9bd0c Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into rvc-dev 2022-04-28 19:45:04 +00:00
Wenhao Wang
248bbf2dca Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into qt-dev 2022-04-28 19:44:46 +00:00
TreeHugger Robot
d096b075cf Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-27 00:39:28 +00:00
TreeHugger Robot
30f00bc233 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-27 00:39:28 +00:00