diff options
| author | 2022-08-11 19:11:29 +0000 | |
|---|---|---|
| committer | 2022-08-11 19:11:29 +0000 | |
| commit | ab3967b2020349df9a6c52d0be3ca048f62bc6e3 (patch) | |
| tree | 8227c5af307405eaabf801226ae857b240d6b173 /libs/androidfw/AssetsProvider.cpp | |
| parent | 6a929ac60fd2f64f2386e46be75c19e3728c7634 (diff) | |
| parent | 8dcf8376e0ea285d3d92c8e7024aa8912348db73 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518948
Change-Id: I8c3cdf83e96c6c44443a4a3e7c5533dd22f47c00
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