diff options
| author | 2022-09-26 04:33:03 +0000 | |
|---|---|---|
| committer | 2022-09-26 04:33:03 +0000 | |
| commit | e8d88e63f14683c46397d9c5f76975d654f87b56 (patch) | |
| tree | 42436c20741b71b451a0bf1b6791bd213162e99f /libs/androidfw/StringPool.cpp | |
| parent | 7f34ec715102312adbb550ab7b38b19ffa1f9243 (diff) | |
| parent | 62da72d873f82d61a84d1640c5f0fe2a9e60eb5d (diff) | |
[automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 7da08c6bd3 am: ef00451cc5 -s ours am: 42815bea3f -s ours am: 3e91dc1fb9 -s ours am: 3a243d920b -s ours am: e2bb30d14a -s ours am: 4ab309b107 -s ours am: 62da72d873 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761
Change-Id: I6365ba128e1f7572a05c02702ac1be15f0675de7
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