diff options
| author | 2022-09-26 02:51:13 +0000 | |
|---|---|---|
| committer | 2022-09-26 02:51:13 +0000 | |
| commit | 8438cf92b7bae4fdf3ec71b8944ac2ada04e57e6 (patch) | |
| tree | 2b35851203c9f6c415d7a82699aa905a8c0f98a9 /libs/androidfw/StringPool.cpp | |
| parent | 9f1a73b9693cd759973e45794452e1fe8c1df0c0 (diff) | |
| parent | 7a3e04b8d609ae3015c35c3057a0f74fbe756cb1 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into sc-dev am: 0c000c879a am: 10166d3457 -s ours am: a47f079f4f -s ours am: 7a3e04b8d6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706
Change-Id: I002bad625bab6947049b487db07587f8e9cfb383
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