diff options
| author | 2022-09-26 02:30:05 +0000 | |
|---|---|---|
| committer | 2022-09-26 02:30:05 +0000 | |
| commit | 7a3e04b8d609ae3015c35c3057a0f74fbe756cb1 (patch) | |
| tree | 61869a6f4abf0e49818ec1c1fd128b33f3c30b21 /libs/androidfw/StringPool.cpp | |
| parent | ad2ab1b0380c9f359c081eb09ac414246f94f150 (diff) | |
| parent | a47f079f4f19dda8e02b525bff439375e235cec7 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706
Change-Id: I945d7d6fe1123ca384a0aaa718c2e169d2b60e71
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