diff options
| author | 2022-09-26 01:59:52 +0000 | |
|---|---|---|
| committer | 2022-09-26 01:59:52 +0000 | |
| commit | a78ee96de15f639c623d6fd78d0a4c118e07ecf5 (patch) | |
| tree | 9d5fe5c5dc06bd02cc22301733ff6b7af71dc27b /libs/androidfw/StringPool.cpp | |
| parent | d316c7d45ca8959d9d70378d7f09e428f0fa83ef (diff) | |
| parent | 0460042adb9391e4cd7d4ced1302bf59328b1462 (diff) | |
[automerger skipped] Merge "Allow activity to be reparent while allowTaskReparenting is applied" into tm-dev am: 7ef756cc75 am: 0460042adb -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: I83b3c20b41a977beb54f7be52e4773902b60e4df
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