diff options
| author | 2022-09-26 03:07:55 +0000 | |
|---|---|---|
| committer | 2022-09-26 03:07:55 +0000 | |
| commit | 5f94a3b863b0404bc61197c13635565ad67a17b0 (patch) | |
| tree | 01e4e1745187befd7811797e0383686cb821c1ff /api/api.go | |
| parent | 1a7716fb9350c5d46378291ebd59f4d0918044b5 (diff) | |
| parent | e9c4950de45e486a6929a305f5b9ebee1df137e4 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into sc-dev am: 0c000c879a am: 10166d3457 -s ours am: a47f079f4f -s ours am: 7a3e04b8d6 -s ours am: e9c4950de4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706
Change-Id: Ic6a50e4f2a2fb38934a965df2f54f34710c0441b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'api/api.go')
0 files changed, 0 insertions, 0 deletions