summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-09-26 01:25:55 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-09-26 01:25:55 +0000
commit35b4aafcc999ac1d49ada184c4d81b8abffd5dfc (patch)
tree39fcb580f3fad7e5a6794701969127630ad7e5ae /libs/androidfw/ApkParsing.cpp
parent904d80fc0630d6d7121b82c7881123fd61924613 (diff)
parenteb63c835cdced7aee593e6d961055a79b6c6ddd2 (diff)
Merge changes from topic "presubmit-am-e095dcb8dc634f1bbc080231db8e0ba1" into sc-mainline-prod
* changes: [automerge] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied 2p: 7af50c4d5f [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions