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