diff options
| author | 2022-08-11 17:06:40 +0000 | |
|---|---|---|
| committer | 2022-08-11 17:06:40 +0000 | |
| commit | 201e93d899493ed07302bff3296e02908086b5e6 (patch) | |
| tree | 94e234bd92a1d237f18e5f1ec213ad3a982399de /libs/androidfw/AssetsProvider.cpp | |
| parent | 7ca38bea984a5633150dc2b0e02fcb3abc0a05b3 (diff) | |
| parent | 192f2e6360528f9c5ade19deffedf0153f676c6b (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518948
Change-Id: I7e3e4394a6658872b17d5cd4423cb8f8f8f8dcd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions