Rahul Banerjee
|
9873e79ec7
|
Merge "Migrate Controls{ProviderSelector,Favoriting,Editing}Activities" into tm-qpr-dev am: 10861bf19d am: 23bc5e6bcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20342393
Change-Id: I3d5aec2c028bbf5cd7a4015400ca2f667aae1e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 01:35:07 +00:00 |
|
Rahul Banerjee
|
23bc5e6bcb
|
Merge "Migrate Controls{ProviderSelector,Favoriting,Editing}Activities" into tm-qpr-dev am: 10861bf19d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20342393
Change-Id: I67c0fc052b410f3a5499fd399779afb64ff265cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 01:16:34 +00:00 |
|
Yuri Lin
|
c20cc4a01c
|
[automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into qt-dev am: 020e76f630 am: 4278c4fff8 -s ours am: 71bfa22c30 -s ours am: ea7cb4db90 -s ours am: 92ac6fa92c -s ours am: 9cccc2dde7 -s ours am: f7cfab78d3 -s ours am: 095a7fafd7 -s ours am: 67fea8eb64 -s ours am: 90cac42c4f -s ours am: fab3aa51b9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20406267
Change-Id: I0f42e4ab88bf26d2e7d6b0f6e5033d891c571469
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 01:13:02 +00:00 |
|
Yuri Lin
|
8c7f925f02
|
[automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 7fcdd1fa0e am: aa82e1c91c -s ours am: ee98ca9b78 -s ours am: 85d658cc5a -s ours am: 146685b3ef -s ours am: 9298e99970 -s ours am: a156dc4234 -s ours am: 041d1aeb24 -s ours am: 6f619501dd -s ours am: 381b1cca90 -s ours am: 9e59c1541e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20406267
Change-Id: Ic2e06222c21a5af4181bd290619904d04a241914
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 01:12:29 +00:00 |
|
Yuri Lin
|
d7389657a8
|
[automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into qt-dev am: 0852b61db1 am: 74525f50a7 -s ours am: 349169cfc1 -s ours am: b74d0aa220 -s ours am: 8382cbfd16 -s ours am: 24492124d0 -s ours am: 7ab3660a0b -s ours am: 887df073e3 -s ours am: 3a3df5be78 -s ours am: b8842ea056 -s ours am: b4266f88f3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20404106
Change-Id: I32e1508f80737bbdbe759210c53d7208d1aec6f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 01:11:56 +00:00 |
|
Yuri Lin
|
4947e9253e
|
[automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: d8d16111a1 am: 6381a6192f -s ours am: 608586c08a -s ours am: c97d507be7 -s ours am: f112408309 -s ours am: ac1984f349 -s ours am: de68d2c411 -s ours am: ddb01e4cc0 -s ours am: cd2f270d58 -s ours am: 3f652067ad -s ours am: b2f8d861d0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20404106
Change-Id: I97a4c137b7d9401089f7b659ca0122ecc1bb7225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 01:11:25 +00:00 |
|
Yein Jo
|
2da908c5c3
|
Merge "Fix SpringAnimation class cast exception." into tm-qpr-dev am: 5ce1b5d682 am: 7bb55bb2b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20332766
Change-Id: I1d0de54b5b924959a8422106f6d1d8c3af9fa85c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 01:10:25 +00:00 |
|
TreeHugger Robot
|
4e41f3e9bc
|
Merge "Enable a shortcut selection test." into tm-qpr-dev am: 36e32b3884 am: 14391d46c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19921604
Change-Id: I0a9b806c7680a00537caee8e5c1212011e6f87a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 01:09:03 +00:00 |
|
Rahul Banerjee
|
10861bf19d
|
Merge "Migrate Controls{ProviderSelector,Favoriting,Editing}Activities" into tm-qpr-dev
|
2022-11-09 01:08:55 +00:00 |
|
Xiang Wang
|
60b76a50d6
|
Merge "Add owners to GameManagerTests" am: 45681820d7 am: a1c8f2158c am: 9af151edcf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2290480
Change-Id: I38fa33415117f461ee91b062151449b736ae71bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 01:07:15 +00:00 |
|
Lyn Han
|
3cc511dc3a
|
Merge "Add FSI_CHROME flag" into tm-qpr-dev am: 98a05fc9bf am: 4961499fe9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20389425
Change-Id: Ia7db6f45bcf231a6328b6174f1e384dff21eb8d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 01:04:41 +00:00 |
|
Yuri Lin
|
fab3aa51b9
|
[automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into qt-dev am: 020e76f630 am: 4278c4fff8 -s ours am: 71bfa22c30 -s ours am: ea7cb4db90 -s ours am: 92ac6fa92c -s ours am: 9cccc2dde7 -s ours am: f7cfab78d3 -s ours am: 095a7fafd7 -s ours am: 67fea8eb64 -s ours am: 90cac42c4f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20406267
Change-Id: I4ee01cc13c7f9f0876e744f247191c82d63ec32d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 01:02:52 +00:00 |
|
Yuri Lin
|
9e59c1541e
|
[automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 7fcdd1fa0e am: aa82e1c91c -s ours am: ee98ca9b78 -s ours am: 85d658cc5a -s ours am: 146685b3ef -s ours am: 9298e99970 -s ours am: a156dc4234 -s ours am: 041d1aeb24 -s ours am: 6f619501dd -s ours am: 381b1cca90 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20406267
Change-Id: I2208d01ee3dbb37939043243ded00d687002593b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 01:02:45 +00:00 |
|
Yuri Lin
|
b4266f88f3
|
[automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into qt-dev am: 0852b61db1 am: 74525f50a7 -s ours am: 349169cfc1 -s ours am: b74d0aa220 -s ours am: 8382cbfd16 -s ours am: 24492124d0 -s ours am: 7ab3660a0b -s ours am: 887df073e3 -s ours am: 3a3df5be78 -s ours am: b8842ea056 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20404106
Change-Id: I7e27d85b710af43c450ae8cec79ffa7bbe05fdfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 01:02:19 +00:00 |
|
Yuri Lin
|
b2f8d861d0
|
[automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: d8d16111a1 am: 6381a6192f -s ours am: 608586c08a -s ours am: c97d507be7 -s ours am: f112408309 -s ours am: ac1984f349 -s ours am: de68d2c411 -s ours am: ddb01e4cc0 -s ours am: cd2f270d58 -s ours am: 3f652067ad -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20404106
Change-Id: Ic7b5a97c20ebe6edc4138f67d2a53fbd517bd6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 01:02:00 +00:00 |
|
TreeHugger Robot
|
f34bcf9d00
|
Merge "Use SOURCE_TOUCHSCREEN as the default last input source."
|
2022-11-09 00:52:29 +00:00 |
|
Yuri Lin
|
90cac42c4f
|
[automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into qt-dev am: 020e76f630 am: 4278c4fff8 -s ours am: 71bfa22c30 -s ours am: ea7cb4db90 -s ours am: 92ac6fa92c -s ours am: 9cccc2dde7 -s ours am: f7cfab78d3 -s ours am: 095a7fafd7 -s ours am: 67fea8eb64 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20406267
Change-Id: Id61e8c0e1d41b0e7ead978cc38e9df2134aacc99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:50:54 +00:00 |
|
Yuri Lin
|
381b1cca90
|
[automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 7fcdd1fa0e am: aa82e1c91c -s ours am: ee98ca9b78 -s ours am: 85d658cc5a -s ours am: 146685b3ef -s ours am: 9298e99970 -s ours am: a156dc4234 -s ours am: 041d1aeb24 -s ours am: 6f619501dd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20406267
Change-Id: I4b8430ab9b1bbb6a4dc05eb1ba76fde0c99efd28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:50:52 +00:00 |
|
Yuri Lin
|
b8842ea056
|
[automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into qt-dev am: 0852b61db1 am: 74525f50a7 -s ours am: 349169cfc1 -s ours am: b74d0aa220 -s ours am: 8382cbfd16 -s ours am: 24492124d0 -s ours am: 7ab3660a0b -s ours am: 887df073e3 -s ours am: 3a3df5be78 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20404106
Change-Id: I4f1e7843a83e7a789d7d8fea28237d194331a5bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:50:38 +00:00 |
|
Yuri Lin
|
3f652067ad
|
[automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: d8d16111a1 am: 6381a6192f -s ours am: 608586c08a -s ours am: c97d507be7 -s ours am: f112408309 -s ours am: ac1984f349 -s ours am: de68d2c411 -s ours am: ddb01e4cc0 -s ours am: cd2f270d58 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20404106
Change-Id: Ib11a4a48c58393d57e5c283906312737da0d87e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:50:25 +00:00 |
|
Yein Jo
|
7bb55bb2b6
|
Merge "Fix SpringAnimation class cast exception." into tm-qpr-dev am: 5ce1b5d682
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20332766
Change-Id: I88e853ed43cba28c8ea44201d0e5b675800c7554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:48:15 +00:00 |
|
TreeHugger Robot
|
14391d46c7
|
Merge "Enable a shortcut selection test." into tm-qpr-dev am: 36e32b3884
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19921604
Change-Id: Idd95ac8d83f68f0b656fe244cf22a2530f677cf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:47:28 +00:00 |
|
Xiang Wang
|
9af151edcf
|
Merge "Add owners to GameManagerTests" am: 45681820d7 am: a1c8f2158c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2290480
Change-Id: If39468c1b0c39828cd2ebddfa16b50f798a40fa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:46:59 +00:00 |
|
Achim Thesmann
|
cc5a41a7ee
|
Merge "Refactor tests."
|
2022-11-09 00:45:22 +00:00 |
|
Yein Jo
|
5ce1b5d682
|
Merge "Fix SpringAnimation class cast exception." into tm-qpr-dev
|
2022-11-09 00:43:59 +00:00 |
|
TreeHugger Robot
|
36e32b3884
|
Merge "Enable a shortcut selection test." into tm-qpr-dev
|
2022-11-09 00:35:50 +00:00 |
|
Lyn Han
|
4961499fe9
|
Merge "Add FSI_CHROME flag" into tm-qpr-dev am: 98a05fc9bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20389425
Change-Id: I139aebe8e15047121dfe749c6a1915ae706d2555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:32:26 +00:00 |
|
Yuri Lin
|
67fea8eb64
|
[automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into qt-dev am: 020e76f630 am: 4278c4fff8 -s ours am: 71bfa22c30 -s ours am: ea7cb4db90 -s ours am: 92ac6fa92c -s ours am: 9cccc2dde7 -s ours am: f7cfab78d3 -s ours am: 095a7fafd7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20406267
Change-Id: I339186c2fcb399ab929429830478c7563935dd8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:18:53 +00:00 |
|
Yuri Lin
|
6f619501dd
|
[automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 7fcdd1fa0e am: aa82e1c91c -s ours am: ee98ca9b78 -s ours am: 85d658cc5a -s ours am: 146685b3ef -s ours am: 9298e99970 -s ours am: a156dc4234 -s ours am: 041d1aeb24 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20406267
Change-Id: I46857e7d0f94e01d810cad09cabc730eaaf36bbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:18:50 +00:00 |
|
Yuri Lin
|
3a3df5be78
|
[automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into qt-dev am: 0852b61db1 am: 74525f50a7 -s ours am: 349169cfc1 -s ours am: b74d0aa220 -s ours am: 8382cbfd16 -s ours am: 24492124d0 -s ours am: 7ab3660a0b -s ours am: 887df073e3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20404106
Change-Id: Ifad04064a014c5d6895302ea91df0d816cba9567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:18:48 +00:00 |
|
Yuri Lin
|
cd2f270d58
|
[automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: d8d16111a1 am: 6381a6192f -s ours am: 608586c08a -s ours am: c97d507be7 -s ours am: f112408309 -s ours am: ac1984f349 -s ours am: de68d2c411 -s ours am: ddb01e4cc0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20404106
Change-Id: I639af3798be76a9d5d9ae50ca86cbe1fa68e6676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:18:47 +00:00 |
|
Xiang Wang
|
a1c8f2158c
|
Merge "Add owners to GameManagerTests" am: 45681820d7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2290480
Change-Id: I9172f9346b8dbdd898af0fb33d653ebc61c382df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:17:19 +00:00 |
|
Automerger Merge Worker
|
ff5ee8f0b3
|
Merge changes from topic "am-7191a6dfb8ab41fdbe6b59c497c9909d"
* changes:
[automerger skipped] Merge "Update naming for the AlternateBouncer" into tm-qpr-dev am: 350ccaaee5 -s ours am: 9fd6a4aa9d -s ours
[automerger skipped] Update naming for the AlternateBouncer am: 2757a5cb26 -s ours am: e8b80155a5 -s ours
|
2022-11-09 00:07:31 +00:00 |
|
TreeHugger Robot
|
f6ebbde06d
|
[automerger skipped] Merge "Update naming for the AlternateBouncer" into tm-qpr-dev am: 350ccaaee5 -s ours am: 9fd6a4aa9d -s ours
am skip reason: Merged-In Icd2f8fbf76192d9ce8b5ecad3aa4919f9c3a49c0 with SHA-1 991093d15e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20385292
Change-Id: I2bec56e6296ea111f0e972879257248bb409e4d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:07:08 +00:00 |
|
Beverly
|
acfbac1cc4
|
[automerger skipped] Update naming for the AlternateBouncer am: 2757a5cb26 -s ours am: e8b80155a5 -s ours
am skip reason: Merged-In Icd2f8fbf76192d9ce8b5ecad3aa4919f9c3a49c0 with SHA-1 991093d15e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20385292
Change-Id: I2ee181fdc6293db7ec238e6a76e4dd27aa7372f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:06:49 +00:00 |
|
Bill Yi
|
671583d08d
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 82f4a78590 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20401010
Change-Id: Ie7e554b1fbe291e60a791703b6326174e539d3e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:06:48 +00:00 |
|
TreeHugger Robot
|
d7f63c7563
|
Merge "Add work profile support to chooser selector" into tm-qpr-dev am: 978d953c71 am: 4fcaaeed8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20341778
Change-Id: Iba1e714a24116f6a63dadcbfebcd4c48f6cd871d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:06:06 +00:00 |
|
Automerger Merge Worker
|
3cd6f0afe4
|
Merge changes from topic "am-c4e7373fe37e4b02bd4f10d3a173c9eb"
* changes:
[automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into rvc-dev am: da89ac7e3c -s ours am: 88e833e696 -s ours am: db3a12a93c -s ours am: db778b8ca1 -s ours am: 9c8a89396c -s ours am: 10c7240805 -s ours am: 832ffe184f -s ours am: ea3101fd99 -s ours am: 9932714163 -s ours
[automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 8de098ee2f -s ours am: 5293d5277d -s ours am: ca1ac4748b -s ours am: f67c2d8c0f -s ours am: 8a4fb2556f -s ours am: 18c425aad1 -s ours am: 9eb154a32e -s ours am: 8041754a77 -s ours am: 51627f8d1b -s ours
[automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into rvc-dev am: 651383dda6 -s ours am: 68af017762 -s ours am: 587867b7e2 -s ours am: a99f8defc6 -s ours am: ed175d9020 -s ours am: 259295079f -s ours am: ad8a3b62a8 -s ours am: dd7de18920 -s ours am: 51f6841465 -s ours
[automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: 2643890445 -s ours am: 696c53ab13 -s ours am: 4050da310c -s ours am: 093dd49b97 -s ours am: 7a34a57bca -s ours am: 7d1ce79e8b -s ours am: c991f59baf -s ours am: 1eeed898e1 -s ours am: 399d6fbeb2 -s ours
|
2022-11-09 00:05:47 +00:00 |
|
Bill Yi
|
87f1054b68
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 62e9f3cebb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20400707
Change-Id: Ia81fd251d014f21949bb871eff8dba47dc8f7ca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:05:28 +00:00 |
|
Yuri Lin
|
03046e5a9c
|
[automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into rvc-dev am: da89ac7e3c -s ours am: 88e833e696 -s ours am: db3a12a93c -s ours am: db778b8ca1 -s ours am: 9c8a89396c -s ours am: 10c7240805 -s ours am: 832ffe184f -s ours am: ea3101fd99 -s ours am: 9932714163 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20406268
Change-Id: Ic1f5e0ce4a9909eadfe7021604db2288c542762d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:05:23 +00:00 |
|
Yuri Lin
|
6e46c97b2b
|
[automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 8de098ee2f -s ours am: 5293d5277d -s ours am: ca1ac4748b -s ours am: f67c2d8c0f -s ours am: 8a4fb2556f -s ours am: 18c425aad1 -s ours am: 9eb154a32e -s ours am: 8041754a77 -s ours am: 51627f8d1b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20406268
Change-Id: I281f51759e796c1feac4f06e76bd781f75cb6c5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:05:05 +00:00 |
|
Yuri Lin
|
0e9a5064b5
|
[automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into rvc-dev am: 651383dda6 -s ours am: 68af017762 -s ours am: 587867b7e2 -s ours am: a99f8defc6 -s ours am: ed175d9020 -s ours am: 259295079f -s ours am: ad8a3b62a8 -s ours am: dd7de18920 -s ours am: 51f6841465 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20404651
Change-Id: I1efec1fd7848fcb7974ab3d1449a9b7e6d40d354
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:04:34 +00:00 |
|
Lyn Han
|
98a05fc9bf
|
Merge "Add FSI_CHROME flag" into tm-qpr-dev
|
2022-11-09 00:04:32 +00:00 |
|
Bill Yi
|
5c87fe4ddc
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8d5d53d134 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20400232
Change-Id: I64d07f140e425ff2a2ac6adc214fb66ccb468e3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:04:29 +00:00 |
|
Yuri Lin
|
70920b7180
|
[automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: 2643890445 -s ours am: 696c53ab13 -s ours am: 4050da310c -s ours am: 093dd49b97 -s ours am: 7a34a57bca -s ours am: 7d1ce79e8b -s ours am: c991f59baf -s ours am: 1eeed898e1 -s ours am: 399d6fbeb2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20404651
Change-Id: I070f402b3703a833a175382d3089ac3478993ae2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:03:52 +00:00 |
|
Automerger Merge Worker
|
b3701f78e6
|
Merge changes from topic "am-47e65471eafa47dab53be8f0414b0e59"
* changes:
[automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into rvc-qpr-dev am: 543b401329 -s ours am: f56d70b80b -s ours am: fc8bb63878 -s ours am: 901637321e -s ours am: 8da3d7ebe7 -s ours am: 9d2b1484bb -s ours am: 7614048bc4 -s ours am: 0951914cbe -s ours
[automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 9631f58f21 -s ours am: ea4f802c09 -s ours am: 6f7ee54f3d -s ours am: ad310bb894 -s ours am: aed9e21639 -s ours am: c71194846b -s ours am: 4a912dfb88 -s ours am: 79d3e1b88d -s ours
[automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into rvc-qpr-dev am: aad71ae8d8 -s ours am: 3f90b84011 -s ours am: 9da4a79e7e -s ours am: 62a472683f -s ours am: 582819d96d -s ours am: f39796e955 -s ours am: 4602ec08fa -s ours am: 15a33ef1ca -s ours
[automerger skipped] [DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule" am: 7c0ae1bdcc -s ours am: 256ebf4a87 -s ours am: aa5661b8af -s ours am: 18d6a090b2 -s ours am: f0fe7151b7 -s ours am: c58568ee1c -s ours am: 2cda3949ce -s ours am: 7fc9da7d3a -s ours
|
2022-11-09 00:03:20 +00:00 |
|
Yuri Lin
|
ff08828fcc
|
[automerger skipped] Merge "[DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system"" into rvc-qpr-dev am: 543b401329 -s ours am: f56d70b80b -s ours am: fc8bb63878 -s ours am: 901637321e -s ours am: 8da3d7ebe7 -s ours am: 9d2b1484bb -s ours am: 7614048bc4 -s ours am: 0951914cbe -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20404652
Change-Id: I12d838fd1fd4594a3bd8c8da216bd499ec272b4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:02:49 +00:00 |
|
Yuri Lin
|
6e0415f8d1
|
[automerger skipped] [DO NOT MERGE] Revert "Fix system zen rules by using owner package name if caller is system" am: 9631f58f21 -s ours am: ea4f802c09 -s ours am: 6f7ee54f3d -s ours am: ad310bb894 -s ours am: aed9e21639 -s ours am: c71194846b -s ours am: 4a912dfb88 -s ours am: 79d3e1b88d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20404652
Change-Id: Ie10795b4732e615354e994140f1fc21408e029f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:02:28 +00:00 |
|
Bill Yi
|
df5f7c5d52
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: e29fb3756c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20399779
Change-Id: Ib3694b56ed01a7573408afeef688b9c161c68f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:02:27 +00:00 |
|
Yuri Lin
|
0e7e02b7d1
|
[automerger skipped] Merge "[DO NOT MERGE] Revert "Check rule package name in ZenModeHelper.addAutomaticRule"" into rvc-qpr-dev am: aad71ae8d8 -s ours am: 3f90b84011 -s ours am: 9da4a79e7e -s ours am: 62a472683f -s ours am: 582819d96d -s ours am: f39796e955 -s ours am: 4602ec08fa -s ours am: 15a33ef1ca -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20404107
Change-Id: I4f8c8776baf6b2df45322df3a881c5d0f28322a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-11-09 00:02:12 +00:00 |
|