diff options
| author | 2022-09-26 05:08:17 +0000 | |
|---|---|---|
| committer | 2022-09-26 05:08:17 +0000 | |
| commit | 951fefdd21f766b1d79d07c95b907462574c9e66 (patch) | |
| tree | d83da3a48640f6df8e535ab1ca8b7a2da3c40868 /libs/androidfw/StringPool.cpp | |
| parent | 1da31fbc6fd64eea569b8622f7b2d24ac93bd8a3 (diff) | |
| parent | 65522dab0fc5375610656829f7ac3e7e0632a0c7 (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: 65522dab0f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761
Change-Id: Ie168f63aff0b0d2687d2a4539ab401afbe4d976e
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