diff options
| author | 2022-09-26 04:33:25 +0000 | |
|---|---|---|
| committer | 2022-09-26 04:33:25 +0000 | |
| commit | b62f4c91b3df80591899445a830ff8f52b33689a (patch) | |
| tree | 42436c20741b71b451a0bf1b6791bd213162e99f /libs/androidfw/StringPool.cpp | |
| parent | e8d88e63f14683c46397d9c5f76975d654f87b56 (diff) | |
| parent | ef8e3203a88faa5690eae459a83ba422729c8d25 (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: ef8e3203a8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761
Change-Id: If17e7c165d6c24e43c5477226d8b6f9358e3bb95
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