diff options
| author | 2022-09-26 04:05:31 +0000 | |
|---|---|---|
| committer | 2022-09-26 04:05:31 +0000 | |
| commit | c9da30ea1a894bcee3e68453d4ba97c35f668416 (patch) | |
| tree | 42436c20741b71b451a0bf1b6791bd213162e99f /libs/androidfw/StringPool.cpp | |
| parent | 374967b8d3623604dfeb27bb4c9b5a330e2af727 (diff) | |
| parent | 5f94a3b863b0404bc61197c13635565ad67a17b0 (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: 5f94a3b863 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706
Change-Id: If27a18786f2812c2d9055fbbff3551d361e1a922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions