diff options
| author | 2022-09-26 04:03:32 +0000 | |
|---|---|---|
| committer | 2022-09-26 04:03:32 +0000 | |
| commit | 12f00a059b92976e2a0e5005b652ffbb2cf1fd9b (patch) | |
| tree | 01e4e1745187befd7811797e0383686cb821c1ff /libs/androidfw/StringPool.cpp | |
| parent | d9cc8d2d1874f91626d8d21dd6bf91ac61542405 (diff) | |
| parent | db79a44f6623dff0dd0e4f888f404fe8c53b1b7f (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: db79a44f66 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761
Change-Id: I361ad4d8f8a9d7772989c03abd0925bb53a29021
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