Presubmit Automerger Backend
|
dada90cbb9
|
[automerger skipped] [automerge] Lower per-app notificationchannel limit 2p: 36acdd6758 am: 6950f0f417 -s ours
am skip reason: Merged-In I8c12e3fc73e4a88842af275feaf2acffcced0402 with SHA-1 3b0929a30d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20084465
Change-Id: Ib382c32f8a727d89bde0a480b2a3bf87d175f96d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-04 19:57:05 +00:00 |
|
Julia Reynolds
|
f16157ca1b
|
[automerger skipped] Merge "Lower per-app notificationchannel limit" into sc-qpr1-dev am: 9595707df0 -s ours
am skip reason: Merged-In I8c12e3fc73e4a88842af275feaf2acffcced0402 with SHA-1 aa170108bd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20079399
Change-Id: I2257bf2950ab6009debb371093bdb5e239e8bac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-04 19:55:11 +00:00 |
|
Julia Reynolds
|
7fa9c4b71f
|
[automerger skipped] Lower per-app notificationchannel limit am: 3b0929a30d -s ours
am skip reason: Merged-In I8c12e3fc73e4a88842af275feaf2acffcced0402 with SHA-1 aa170108bd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20079399
Change-Id: I05c4baa3cd0e759f240fb1d8786fd1c76cf26e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-04 19:55:02 +00:00 |
|
Julia Reynolds
|
9595707df0
|
Merge "Lower per-app notificationchannel limit" into sc-qpr1-dev
|
2022-10-04 19:19:17 +00:00 |
|
Julia Reynolds
|
16c4ba8c28
|
Merge "Lower per-app notificationchannel limit" into sc-v2-dev
|
2022-10-04 19:19:13 +00:00 |
|
TreeHugger Robot
|
f88c3bc851
|
[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into sc-dev am: e667a6bfe2 am: f259cf50fe -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20013777
Change-Id: Ie84f5af18d5e6ac082564ad11c1351e4bcd8e193
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-04 01:30:24 +00:00 |
|
Pinyao Ting
|
56d11db9b5
|
[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into rvc-dev am: 9e3aecfce1 am: f552951850 -s ours am: c03b0e2d78 -s ours am: e1db2fe6a0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015227
Change-Id: Ie7749a1764871655d9f5d90e03738c8e3ba0ae19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-04 01:30:17 +00:00 |
|
Pinyao Ting
|
ac01de83cb
|
[automerger skipped] [Do Not Merge] Ignore malformed shortcuts am: a8fe41afb0 am: 10033535fc -s ours am: 5774c8409a -s ours am: a8ab42d12e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015227
Change-Id: I9e0a1960c361eb6630a3e58e007ae96d3daec7d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-04 01:30:15 +00:00 |
|
TreeHugger Robot
|
a0b9c69054
|
Merge changes from topic "presubmit-am-a10436ba523c443696b70308db2adac6" into sc-qpr1-dev am: d7133ae51e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20013777
Change-Id: I43d493b6df8ad9354bda84695cb2b98334995e68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-04 01:30:01 +00:00 |
|
Presubmit Automerger Backend
|
7aec23bf3f
|
[automerger skipped] [automerge] [Do Not Merge] Ignore malformed shortcuts 2p: 36338a3152 am: a536efe21e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20013777
Change-Id: I76fb5819de0b44ab38b402ea761dca40e197ca04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-04 01:29:56 +00:00 |
|
TreeHugger Robot
|
f259cf50fe
|
Merge "[Do Not Merge] Ignore malformed shortcuts" into sc-dev am: e667a6bfe2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20013777
Change-Id: I440fdfe4b0da59fff53c2d39c4a5048c556816ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-04 01:01:17 +00:00 |
|
Pinyao Ting
|
e1db2fe6a0
|
[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into rvc-dev am: 9e3aecfce1 am: f552951850 -s ours am: c03b0e2d78 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015227
Change-Id: Id994cb03179572ecc1028c9dba0d28c2ec765d59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-04 01:00:59 +00:00 |
|
Pinyao Ting
|
a8ab42d12e
|
[automerger skipped] [Do Not Merge] Ignore malformed shortcuts am: a8fe41afb0 am: 10033535fc -s ours am: 5774c8409a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015227
Change-Id: I1a3811153cec0a5a25a7176095f70fdae7a53515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-04 01:00:57 +00:00 |
|
TreeHugger Robot
|
d7133ae51e
|
Merge changes from topic "presubmit-am-a10436ba523c443696b70308db2adac6" into sc-qpr1-dev
* changes:
[automerge] [Do Not Merge] Ignore malformed shortcuts 2p: 36338a3152
[Do Not Merge] Ignore malformed shortcuts
|
2022-10-04 00:59:35 +00:00 |
|
TreeHugger Robot
|
e667a6bfe2
|
Merge "[Do Not Merge] Ignore malformed shortcuts" into sc-dev
|
2022-10-04 00:59:35 +00:00 |
|
Pinyao Ting
|
c03b0e2d78
|
[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into rvc-dev am: 9e3aecfce1 am: f552951850 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015227
Change-Id: I03c88f1d6db32f10a16ab68ef688351eb181fcf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-04 00:14:18 +00:00 |
|
Pinyao Ting
|
5774c8409a
|
[automerger skipped] [Do Not Merge] Ignore malformed shortcuts am: a8fe41afb0 am: 10033535fc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015227
Change-Id: Ia6d942ee8af077cb5e1451fff81519d0768e0514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-04 00:13:58 +00:00 |
|
TreeHugger Robot
|
4e12bdc3cd
|
[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev am: 8a2baf4e16 am: de5113eebd -s ours am: 2fcbfbf644 -s ours am: 725961fbbf -s ours am: d0836243e3 -s ours am: 9f6e9f9f96 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225
Change-Id: If166b42b11fb7b1d32f3faca1578b6bec7beacb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-03 23:46:22 +00:00 |
|
Pinyao Ting
|
ce5fbbc8fe
|
[automerger skipped] [Do Not Merge] Ignore malformed shortcuts am: 9b0dd514d2 am: f67179a1ff -s ours am: 0750f90369 -s ours am: b74c7cbb9d -s ours am: aa594c9dd0 -s ours am: ebb3803e1b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225
Change-Id: I053377e7f0bb1d13097691e949e3f0e6b9870813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-03 23:46:12 +00:00 |
|
Pinyao Ting
|
f552951850
|
Merge "[Do Not Merge] Ignore malformed shortcuts" into rvc-dev am: 9e3aecfce1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015227
Change-Id: I6f24475c941abe5046db5264af1ada1ec7c69da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-03 23:43:22 +00:00 |
|
Pinyao Ting
|
10033535fc
|
[Do Not Merge] Ignore malformed shortcuts am: a8fe41afb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015227
Change-Id: Iec12138fa01ed8ddb78a1d62307afd157d8060ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-03 23:43:13 +00:00 |
|
TreeHugger Robot
|
9f6e9f9f96
|
[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev am: 8a2baf4e16 am: de5113eebd -s ours am: 2fcbfbf644 -s ours am: 725961fbbf -s ours am: d0836243e3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225
Change-Id: Idb910ad4ef8d9cd128b447f0e934202242ab311c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-03 23:17:51 +00:00 |
|
Pinyao Ting
|
ebb3803e1b
|
[automerger skipped] [Do Not Merge] Ignore malformed shortcuts am: 9b0dd514d2 am: f67179a1ff -s ours am: 0750f90369 -s ours am: b74c7cbb9d -s ours am: aa594c9dd0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225
Change-Id: Icab47ee8c92c87bcd9d3bc30b1334933430f231f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-03 23:17:50 +00:00 |
|
Pinyao Ting
|
9e3aecfce1
|
Merge "[Do Not Merge] Ignore malformed shortcuts" into rvc-dev
|
2022-10-03 23:10:14 +00:00 |
|
TreeHugger Robot
|
d0836243e3
|
[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev am: 8a2baf4e16 am: de5113eebd -s ours am: 2fcbfbf644 -s ours am: 725961fbbf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225
Change-Id: Ida6d60e4964d31dc54c60a541f30ec648932da79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-03 22:47:26 +00:00 |
|
Pinyao Ting
|
aa594c9dd0
|
[automerger skipped] [Do Not Merge] Ignore malformed shortcuts am: 9b0dd514d2 am: f67179a1ff -s ours am: 0750f90369 -s ours am: b74c7cbb9d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225
Change-Id: Id700ea0c3362577838dcf04d2d4ef66301aa8ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-03 22:46:58 +00:00 |
|
TreeHugger Robot
|
725961fbbf
|
[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev am: 8a2baf4e16 am: de5113eebd -s ours am: 2fcbfbf644 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225
Change-Id: I1e8c15a710b25ee3be43f66dfb87ff3ac934e83b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-03 22:17:30 +00:00 |
|
Pinyao Ting
|
b74c7cbb9d
|
[automerger skipped] [Do Not Merge] Ignore malformed shortcuts am: 9b0dd514d2 am: f67179a1ff -s ours am: 0750f90369 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225
Change-Id: I539ade65ec5fd83412a2df04fdc6e780f1e5832b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-03 22:17:17 +00:00 |
|
TreeHugger Robot
|
2fcbfbf644
|
[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev am: 8a2baf4e16 am: de5113eebd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225
Change-Id: I519e92f1b6ed06675d1c3bea1ee817f05e1ee241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-03 21:33:29 +00:00 |
|
Pinyao Ting
|
0750f90369
|
[automerger skipped] [Do Not Merge] Ignore malformed shortcuts am: 9b0dd514d2 am: f67179a1ff -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225
Change-Id: I660704085d0f838fc10ab1a280262c86faf41c8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-03 21:33:09 +00:00 |
|
TreeHugger Robot
|
de5113eebd
|
Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev am: 8a2baf4e16
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225
Change-Id: If25d47e0bf3f6b5fd6d33dcdd57e82e5475ba893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-03 21:05:51 +00:00 |
|
Pinyao Ting
|
f67179a1ff
|
[Do Not Merge] Ignore malformed shortcuts am: 9b0dd514d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225
Change-Id: I4591ed42f0af65bab2679fdc99aa824b28ba0a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-10-03 21:05:36 +00:00 |
|
TreeHugger Robot
|
8a2baf4e16
|
Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev
|
2022-10-03 20:23:07 +00:00 |
|
Julia Reynolds
|
3b0929a30d
|
Lower per-app notificationchannel limit
Test: PreferencesHelperTest
Bug: 240422263
Change-Id: I8c12e3fc73e4a88842af275feaf2acffcced0402
Merged-In: I8c12e3fc73e4a88842af275feaf2acffcced0402
(cherry picked from commit f528b337dd)
|
2022-09-30 15:56:37 +00:00 |
|
Presubmit Automerger Backend
|
6950f0f417
|
[automerge] Lower per-app notificationchannel limit 2p: 36acdd6758
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20084465
Bug: 240422263
Change-Id: If614cbbe9b370a02990e238091424699776221b8
Merged-In: I8c12e3fc73e4a88842af275feaf2acffcced0402
|
2022-09-30 13:48:27 +00:00 |
|
Julia Reynolds
|
36acdd6758
|
Lower per-app notificationchannel limit
Test: PreferencesHelperTest
Bug: 240422263
Change-Id: I8c12e3fc73e4a88842af275feaf2acffcced0402
(cherry picked from commit f528b337dd)
Merged-In: I8c12e3fc73e4a88842af275feaf2acffcced0402
|
2022-09-30 13:48:07 +00:00 |
|
Julia Reynolds
|
aa170108bd
|
Lower per-app notificationchannel limit
Test: PreferencesHelperTest
Bug: 240422263
Change-Id: I8c12e3fc73e4a88842af275feaf2acffcced0402
Merged-In: I8c12e3fc73e4a88842af275feaf2acffcced0402
(cherry picked from commit f528b337dd)
|
2022-09-30 13:47:47 +00:00 |
|
Matt Pietal
|
ec6bffc879
|
[automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev am: 2663e8aa43 am: 4f404a5015 -s ours am: 974a8471ea -s ours am: e32da18b5e -s ours am: 0b21b97d57 -s ours am: f42de9e535 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952040
Change-Id: I69ca66cf004f97b06e91c3ab768fd4b8d90a1a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-28 16:09:40 +00:00 |
|
Matt Pietal
|
bc66d3802b
|
[automerger skipped] [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 am: d78f1693ef -s ours am: 4b70b75d1c -s ours am: feba47c36a -s ours am: 0d3f936b8b -s ours am: 5387568458 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20067847
Change-Id: I25314284832f9f661b0a11726bd358198efcabcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-28 16:09:31 +00:00 |
|
TreeHugger Robot
|
5e2b9a43ca
|
Merge "Prevent exfiltration of system files via avatar picker." into sc-dev am: 43e0f944cb am: f76ea6006a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19748987
Change-Id: I1b6518355105946b55ae7c6255ec89f80585bc50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-28 16:09:23 +00:00 |
|
TreeHugger Robot
|
969e9cf845
|
Merge changes from topic "presubmit-am-5e85a1ad75f141e799291ec6c22492f6" into sc-qpr1-dev am: a30bf19d1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19748987
Change-Id: I5f72738e075f3a463b2a6e2835e6a64eb22026b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-28 16:08:56 +00:00 |
|
Matt Pietal
|
f42de9e535
|
[automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev am: 2663e8aa43 am: 4f404a5015 -s ours am: 974a8471ea -s ours am: e32da18b5e -s ours am: 0b21b97d57 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952040
Change-Id: I7857f3cb85e99a3a579e14698a50602ae9e3d50d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-28 16:06:27 +00:00 |
|
Matt Pietal
|
5387568458
|
[automerger skipped] [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 am: d78f1693ef -s ours am: 4b70b75d1c -s ours am: feba47c36a -s ours am: 0d3f936b8b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20067847
Change-Id: Ibb01e635df3c610fe2c907bdb59b09b38e1f8e04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-28 16:06:19 +00:00 |
|
TreeHugger Robot
|
f76ea6006a
|
Merge "Prevent exfiltration of system files via avatar picker." into sc-dev am: 43e0f944cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19748987
Change-Id: I9a1ae98fe5680fc9bf11ba2641b3dbd73d9de954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-28 16:06:12 +00:00 |
|
Matt Pietal
|
0b21b97d57
|
[automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev am: 2663e8aa43 am: 4f404a5015 -s ours am: 974a8471ea -s ours am: e32da18b5e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952040
Change-Id: Id8ef18cf31bc22166fc91918f407050375ccd14f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-28 15:53:52 +00:00 |
|
Matt Pietal
|
0d3f936b8b
|
[automerger skipped] [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 am: d78f1693ef -s ours am: 4b70b75d1c -s ours am: feba47c36a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20067847
Change-Id: I8f3df0fe8488e5f874434823f9c4af284a8f3f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-28 15:53:20 +00:00 |
|
TreeHugger Robot
|
a30bf19d1c
|
Merge changes from topic "presubmit-am-5e85a1ad75f141e799291ec6c22492f6" into sc-qpr1-dev
* changes:
[automerge] Prevent exfiltration of system files via avatar picker. 2p: 1b48ca6b7f
Prevent exfiltration of system files via avatar picker.
|
2022-09-28 15:37:33 +00:00 |
|
TreeHugger Robot
|
43e0f944cb
|
Merge "Prevent exfiltration of system files via avatar picker." into sc-dev
|
2022-09-28 15:37:33 +00:00 |
|
Matt Pietal
|
e32da18b5e
|
[automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev am: 2663e8aa43 am: 4f404a5015 -s ours am: 974a8471ea -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952040
Change-Id: Icf19ede4651fb9f6187c4bac9f5b844061d438fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-28 14:53:46 +00:00 |
|
Matt Pietal
|
feba47c36a
|
[automerger skipped] [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 am: d78f1693ef -s ours am: 4b70b75d1c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20067847
Change-Id: Ia105005b59b08288288fd1cfc7e139080fa8df00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-09-28 14:53:24 +00:00 |
|