summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Jeff Chang <chengjeff@google.com> 2022-11-22 02:52:46 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-22 02:52:46 +0000
commitdec8f84817e2d8fbb40c2ef56ddf9429f7cf1859 (patch)
treea7bffcfb3264db11d146ba6f8efe4fe63883e69a /libs/androidfw/StringPool.cpp
parent40a630abd2a2b0b5c5f79470ea0789602241ba3e (diff)
parent8bcd87e2028293d96fa30a6ad5eebb1811170224 (diff)
[automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 337a2353ae -s ours am: 8bcd87e202 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20513541 Change-Id: Ib8c5c3f187d8a887fb4cbeeec58a9f9bc3cd17c9 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