diff options
| author | 2022-09-26 04:09:23 +0000 | |
|---|---|---|
| committer | 2022-09-26 04:09:23 +0000 | |
| commit | 7f34ec715102312adbb550ab7b38b19ffa1f9243 (patch) | |
| tree | 42436c20741b71b451a0bf1b6791bd213162e99f /libs/androidfw/StringPool.cpp | |
| parent | 177dc42754907cd1112f436bd578134069beadf4 (diff) | |
| parent | d3575eb1f8983b54e2b72a039463c4512c23501d (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: 3ceaa7ef49 -s ours am: d3575eb1f8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761
Change-Id: Ibc712c7af2714c478ee1b4f19f79b634ec7e8e05
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