diff options
| author | 2022-09-26 05:10:44 +0000 | |
|---|---|---|
| committer | 2022-09-26 05:10:44 +0000 | |
| commit | 5c116672d4369f9cfa363f74073c6e5cf93c8628 (patch) | |
| tree | 00fa7171c8932596fcdef3115f57c9e303e938f6 /libs/androidfw/StringPool.cpp | |
| parent | 408ae2a4f85c2ad5688dd43f67fdc758afb2def0 (diff) | |
| parent | 9705a0fa3b0676552704ab865b25e6bc40fe3bd9 (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: 8eb8a9261e -s ours am: 9705a0fa3b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761
Change-Id: I0e041cb112f4bd0429ddb1156e71f12608b61c17
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