Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
651,990 Commits 3 Branches 0 Tags
f259cf50fef7397aa55ebef2ffaad1d228e54fdd
Commit Graph

651990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
e667a6bfe2 Merge "[Do Not Merge] Ignore malformed shortcuts" into sc-dev 2022-10-04 00:59:35 +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
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
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
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
Matt Pietal
974a8471ea [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 skip reason: subject contains skip directive

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

Change-Id: I1a7ec8e03a49993aa99f2b8317755b1569e70b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 14:24:54 +00:00
Matt Pietal
4b70b75d1c [automerger skipped] [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 am: d78f1693ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6b7f47d6cdb87b4861b925a1fa0a2db742632b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 14:24:30 +00:00
Matt Pietal
4f404a5015 Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev am: 2663e8aa43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952040

Change-Id: Id5d34e9689120d991ca8904938c38c81cd018ad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 13:57:36 +00:00
Matt Pietal
d78f1693ef [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952040

Change-Id: Ie7874f87fa568f76047a9e08dae3d406b7b565f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 12:52:00 +00:00
Matt Pietal
1f05e19f47 [automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into sc-dev am: d829ed5908 -s ours 
am skip reason: Merged-In I3f59df865dc2dd13d4b9ac54bb2dacb7b23f0aa1 with SHA-1 18ddad1f5a is already in history

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

Change-Id: I37ee766495cdc0a0e9c53a39b122dfb53e78d08f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 19:47:10 +00:00
Matt Pietal
69194b040a [automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into rvc-dev am: d7710fc38a am: 2fdf59ef45 -s ours am: 1702e5f4dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8bbb2d3df0e9c4829dcc8a4b6e8ffdaeafb3886c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 19:46:58 +00:00
Matt Pietal
bd3fa738bb [automerger skipped] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: bc2146966b am: dc0ba857f2 -s ours am: 5820c126ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie25bc4736ffec5214c9864a89ab4ab3a21cc4ef7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 19:46:54 +00:00
Matt Pietal
2663e8aa43 Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev 2022-09-27 19:25:13 +00:00
Matt Pietal
d829ed5908 Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into sc-dev 2022-09-27 19:24:52 +00:00
Matt Pietal
98ef8f1675 Merge changes from topic "presubmit-am-b344c51c0b2b40219ea014db7d70478f" into sc-qpr1-dev 
* changes:
  [automerge] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing 2p: 18ddad1f5a
  [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing
 2022-09-27 19:24:45 +00:00
Matt Pietal
1702e5f4dd [automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into rvc-dev am: d7710fc38a am: 2fdf59ef45 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b89264303737e8e8d92045fa517c367235d5908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 19:12:48 +00:00
Matt Pietal
5820c126ed [automerger skipped] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: bc2146966b am: dc0ba857f2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0bf9393b97cabfc6bed5dd3eb6c5e1cdfd7dcf49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 19:12:34 +00:00
Matt Pietal
2fdf59ef45 Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into rvc-dev am: d7710fc38a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952038

Change-Id: Ic5a7614e9843dbb20f563eb518c761762bf47204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:42:37 +00:00
Matt Pietal
dc0ba857f2 [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: bc2146966b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952038

Change-Id: I18ee62f32bf7c7364ad5e88643a6cd3ac7f8eb71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 18:42:26 +00:00
Matt Pietal
d7710fc38a Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into rvc-dev 2022-09-27 18:05:36 +00:00
Jeff Chang
b482a00d3c [automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into rvc-dev am: d667038512 am: 86138c26fd -s ours am: 7de60a5467 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I513a2659ed8021487dad0d5c6a64008527ecb787
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 03:03:51 +00:00
Jeff Chang
3e91dc1fb9 [automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 7da08c6bd3 am: ef00451cc5 -s ours am: 42815bea3f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c2fff735969279d3614638dce3629b4cde0d928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 03:03:50 +00:00
Jeff Chang
7de60a5467 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into rvc-dev am: d667038512 am: 86138c26fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1972c4e34d0ba0fed2997cd3e8ed8c1bc3ba69e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 02:47:58 +00:00
Jeff Chang
42815bea3f [automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 7da08c6bd3 am: ef00451cc5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b24dd60de0d2d031fcaadb1dd968a92e8b3fcbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 02:47:31 +00:00
Jeff Chang
86138c26fd Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into rvc-dev am: d667038512 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761

Change-Id: I4ee9fc257692776e5dbd465f217ca9d10e693892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 02:12:38 +00:00