summaryrefslogtreecommitdiff
path: root/tools/aapt/Command.cpp
diff options
context:
space:
mode:
author Jeff Chang <chengjeff@google.com> 2022-09-26 03:07:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-26 03:07:19 +0000
commitfd8f66dc2dcdad6cdec78ae06db9a5b13e18c51b (patch)
tree01e4e1745187befd7811797e0383686cb821c1ff /tools/aapt/Command.cpp
parentc62a3ddaffefe867b1b49f2846cf8fc274af4329 (diff)
parent61ef79fa5ef56872998b477cf7b0a4f1f487bcd6 (diff)
[automerger skipped] [automerge] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied 2p: 7af50c4d5f am: c30420a5cf -s ours am: 8e944c7e5d -s ours am: a2c1b0bb8f -s ours am: 61ef79fa5e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706 Change-Id: If3bc899cdd88a3a59e4dd2332836ca54d65cc885 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt/Command.cpp')
0 files changed, 0 insertions, 0 deletions