summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Jeff Chang <chengjeff@google.com> 2022-09-26 07:42:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-26 07:42:18 +0000
commit9b8ad35c08cd50fad2a57cc25614dd12a5f1923d (patch)
treee1e0142a61b19c784857a33cf05799684c19af85 /libs/androidfw/StringPool.cpp
parentc5d0589bf7cd6cec4fe1aa82294baff6ec012d33 (diff)
parent3b249858276f0fd97c652629ddf74eda8386f748 (diff)
[automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 7da08c6bd3 am: ef00451cc5 -s ours am: 42815bea3f -s ours am: 3e91dc1fb9 -s ours am: 3a243d920b -s ours am: e2bb30d14a -s ours am: 3b24985827 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761 Change-Id: Ibd93a78d59d8ce055e03a60cff14de9a70e6b5f4 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