diff options
| author | 2022-09-26 04:05:56 +0000 | |
|---|---|---|
| committer | 2022-09-26 04:05:56 +0000 | |
| commit | 47b11ecc4a5fb58da8964f32349ae1a8b0b430f4 (patch) | |
| tree | 42436c20741b71b451a0bf1b6791bd213162e99f /libs/androidfw/StringPool.cpp | |
| parent | c9da30ea1a894bcee3e68453d4ba97c35f668416 (diff) | |
| parent | a1cfede6a161e0b6dad39f3d7a19388a286a0956 (diff) | |
Merge "[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: e9c4950de4 -s ours" into tm-d1-dev-plus-aosp am: a1cfede6a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706
Change-Id: Ib21aa490f21a5b5ea110101fd4a6634f4d7d694e
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