diff options
| author | 2022-09-26 07:42:25 +0000 | |
|---|---|---|
| committer | 2022-09-26 07:42:25 +0000 | |
| commit | 43b487a8be3730ea435705a15b065740bafc61a4 (patch) | |
| tree | e1e0142a61b19c784857a33cf05799684c19af85 /libs/androidfw/StringPool.cpp | |
| parent | 9b8ad35c08cd50fad2a57cc25614dd12a5f1923d (diff) | |
| parent | 04343b68853faff3e00a760964ee25d4e1a648a3 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into rvc-dev am: d667038512 am: 86138c26fd -s ours am: 7de60a5467 -s ours am: b482a00d3c -s ours am: 5c12244497 -s ours am: 0d97ae791b -s ours am: 04343b6885 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761
Change-Id: I46e5c37c0e42a747c00264f04c15293f9ae780fc
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