diff options
| author | 2022-09-26 04:04:00 +0000 | |
|---|---|---|
| committer | 2022-09-26 04:04:00 +0000 | |
| commit | 374967b8d3623604dfeb27bb4c9b5a330e2af727 (patch) | |
| tree | 42436c20741b71b451a0bf1b6791bd213162e99f /libs/androidfw/StringPool.cpp | |
| parent | f922498fa03247595a708ef2e0c7f34d66d4a202 (diff) | |
| parent | 8807d473ccfc62c5b58c706d73f1e42f20c1a34d (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: 22a5499344 -s ours am: 8807d473cc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706
Change-Id: I179bfad6ab34396dd57c8c2357c6fc1b8147d171
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