summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Jeff Chang <chengjeff@google.com> 2022-11-22 03:47:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-22 03:47:04 +0000
commitc13b78eda142dda229f89d8be1979c594cba4c1b (patch)
tree02cdc5769e54bceef498b036ba741285d6217b6b /libs/androidfw/ConfigDescription.cpp
parent440ab39b90f5f9b84ea5c3d0d5d2d33c40058777 (diff)
parent59d1c8f546d3c87532442c5a72011e383efbcc9b (diff)
[automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 337a2353ae -s ours am: 8bcd87e202 -s ours am: dec8f84817 -s ours am: 59d1c8f546 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20513541 Change-Id: Ic8da7297d3ce849bc981764a35fe9a1f6ddd22f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions