diff options
| author | 2022-09-26 04:18:58 +0000 | |
|---|---|---|
| committer | 2022-09-26 04:18:58 +0000 | |
| commit | 8eb8a9261eb8db2bdd0404bedc62da72267dead9 (patch) | |
| tree | 01e4e1745187befd7811797e0383686cb821c1ff /libs/androidfw/StringPool.cpp | |
| parent | 65522dab0fc5375610656829f7ac3e7e0632a0c7 (diff) | |
| parent | d6e2990a85804d6f2a4ddfc4035cfc55a98540d8 (diff) | |
[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: b482a00d3c -s ours am: 5c12244497 -s ours am: 0d97ae791b -s ours am: d6e2990a85 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761
Change-Id: Id053e62663af6bdccfd149ddedf1bae15f250b33
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