diff options
| author | 2022-09-26 05:08:27 +0000 | |
|---|---|---|
| committer | 2022-09-26 05:08:27 +0000 | |
| commit | 9705a0fa3b0676552704ab865b25e6bc40fe3bd9 (patch) | |
| tree | d83da3a48640f6df8e535ab1ca8b7a2da3c40868 /libs/androidfw/StringPool.cpp | |
| parent | 951fefdd21f766b1d79d07c95b907462574c9e66 (diff) | |
| parent | 8eb8a9261eb8db2bdd0404bedc62da72267dead9 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761
Change-Id: I01a90d72d4fa88764660fd23a886b88a68b3cb1a
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