diff options
| author | 2022-09-26 07:41:54 +0000 | |
|---|---|---|
| committer | 2022-09-26 07:41:54 +0000 | |
| commit | c5d0589bf7cd6cec4fe1aa82294baff6ec012d33 (patch) | |
| tree | e1e0142a61b19c784857a33cf05799684c19af85 /libs/androidfw/StringPool.cpp | |
| parent | 50d0e62460b70f59c7b03c4df73e2ec10e476474 (diff) | |
| parent | 8438cf92b7bae4fdf3ec71b8944ac2ada04e57e6 (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: 8438cf92b7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706
Change-Id: I80a1dd6ddb3ce385fd2adbca6f3626852af2cfda
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