diff options
| author | 2022-09-26 02:16:29 +0000 | |
|---|---|---|
| committer | 2022-09-26 02:16:29 +0000 | |
| commit | abed609985ab0c59eaada2fcffc692138c69b9d3 (patch) | |
| tree | 42436c20741b71b451a0bf1b6791bd213162e99f /libs/androidfw/StringPool.cpp | |
| parent | 24192d430cdc612de755a2ab2a04f092240cba58 (diff) | |
| parent | c62a3ddaffefe867b1b49f2846cf8fc274af4329 (diff) | |
[automerger skipped] Merge "Merge "Allow activity to be reparent while allowTaskReparenting is applied" into tm-dev am: 7ef756cc75 am: 31937d2f45" into tm-d1-dev-plus-aosp am: c62a3ddaff -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: I3df48b0b3d7ab5a8247267728686a6ba842238e0
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