summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-08-11 16:49:35 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-11 16:49:35 +0000
commit192f2e6360528f9c5ade19deffedf0153f676c6b (patch)
treeb91bbd1d6e006704303f3bffb7fee6298d704cb4 /libs/androidfw/StringPool.cpp
parentb38b3eaccb2509bf2c55a1859250fb4616e31dc0 (diff)
parentb302dca7985351071446b62847055a9f3d8539d1 (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev am: 750c978db5 am: b302dca798 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518948 Change-Id: I37fb6ef29c8bf945b2d2201b71d18a8589effcf1 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