diff options
| author | 2022-09-26 02:33:20 +0000 | |
|---|---|---|
| committer | 2022-09-26 02:33:20 +0000 | |
| commit | 9bc28e8446b6bc4465cd76becbfe169100d0659a (patch) | |
| tree | 06270a31b925b9d1bd5bffc29cba65faf82e2088 /libs/androidfw/StringPool.cpp | |
| parent | 826721d11b5f5e7c6aaa797752321dfba25e7b0d (diff) | |
| parent | ea537c9b8f9e336bb7559253e758783f57040700 (diff) | |
[automerger skipped] Merge "Allow activity to be reparent while allowTaskReparenting is applied" into tm-dev am: 7ef756cc75 am: 0460042adb -s ours am: a78ee96de1 -s ours am: ea537c9b8f -s ours
am skip reason: Merged-In I73abb9ec05af95bc14f887ae825a9ada9600f771 with SHA-1 f19d69f26f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19968964
Change-Id: I4f1f3f33134be7b88f53d2e6096ceb15fdf913a3
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