diff options
| author | 2022-09-26 03:59:40 +0000 | |
|---|---|---|
| committer | 2022-09-26 03:59:40 +0000 | |
| commit | 04343b68853faff3e00a760964ee25d4e1a648a3 (patch) | |
| tree | 2b35851203c9f6c415d7a82699aa905a8c0f98a9 /libs/androidfw/StringPool.cpp | |
| parent | 3b249858276f0fd97c652629ddf74eda8386f748 (diff) | |
| parent | 0d97ae791b2bcb43eddb94dac01d90b35954434b (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761
Change-Id: I3a0c0ee73b7922589e0804f5daae7b8c8465620a
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