summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-08-11 18:25:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-11 18:25:04 +0000
commit563b3fefb6e80455b672da1a09514f5f986e7723 (patch)
tree2f9ea15cf5c46acbe0a5cd0f9da7de7e1adf6318 /libs/androidfw/AttributeResolution.cpp
parentbef30a8056772893fea7b60cb36cfcf0df171116 (diff)
parent81c1f99ba746520b74f16935589c132672611cc0 (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into sc-dev am: 860327234e -s ours am: 2ec4fb22ce -s ours am: 9c03d8f8d0 -s ours am: 222c361f0b -s ours am: c7655f1ee8 -s ours am: 81c1f99ba7 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518946 Change-Id: Ibc5a2a8e817dcccf7355706f3c17ff590fd55c4e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions