diff options
| author | 2022-09-26 02:15:48 +0000 | |
|---|---|---|
| committer | 2022-09-26 02:15:48 +0000 | |
| commit | da80e4f2070a8c83cfc692e7482091eb1fefff52 (patch) | |
| tree | 42436c20741b71b451a0bf1b6791bd213162e99f /libs/androidfw/StringPool.cpp | |
| parent | ea537c9b8f9e336bb7559253e758783f57040700 (diff) | |
| parent | 15ff5ab8e50545e57b0d8b1f7cad768b7c8fcad1 (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 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: I69a3f946463a9147489dc37c229e7c66e22ac5de
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