diff options
| author | 2022-11-22 02:52:48 +0000 | |
|---|---|---|
| committer | 2022-11-22 02:52:48 +0000 | |
| commit | 741be155f2225e5c826a70461571d36604db35ec (patch) | |
| tree | a7bffcfb3264db11d146ba6f8efe4fe63883e69a /libs/androidfw/StringPool.cpp | |
| parent | dec8f84817e2d8fbb40c2ef56ddf9429f7cf1859 (diff) | |
| parent | a302649a72f050ce0bfc5d232c568041d015aafa (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into sc-v2-dev am: 172f1c303c -s ours am: a302649a72 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20513541
Change-Id: I92545c265741e9306619cd2efb18825692ec7136
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