diff options
| author | 2022-08-11 19:55:41 +0000 | |
|---|---|---|
| committer | 2022-08-11 19:55:41 +0000 | |
| commit | 56f8eee93064e8ca2c02071f28b771f207666fc0 (patch) | |
| tree | 87dca8d273f1cc8d76517cb84991b95687a26465 /libs/androidfw/StringPool.cpp | |
| parent | 621f13ee2580088d90df1e4cb276e30f812122a2 (diff) | |
| parent | 95584a42c7979c9be2a917b2f6a4e3c3a6a9f953 (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: 192f2e6360 -s ours am: 201e93d899 -s ours am: e16f53a4f4 -s ours am: 9fd3c6f739 -s ours am: 8dcf8376e0 -s ours am: ab3967b202 -s ours am: 93b048542d -s ours am: 95584a42c7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518948
Change-Id: I1e7a0bb00b44d33ffc0949226988f9265248083c
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