diff options
| author | 2022-08-11 19:56:39 +0000 | |
|---|---|---|
| committer | 2022-08-11 19:56:39 +0000 | |
| commit | 706cf76766feb63d4ec7ce9b3d03c9b319a69757 (patch) | |
| tree | 87dca8d273f1cc8d76517cb84991b95687a26465 /libs/androidfw/StringPool.cpp | |
| parent | 7e610b2e452a0d0092b2064ef752417a8f9fd22b (diff) | |
| parent | 970cc06524961263160a870f0eda7f6521a105ae (diff) | |
Merge changes from topic "am-30f6c1eb81c147a7894122314c24b13f" into tm-qpr-dev-plus-aosp
* changes:
[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: 756426c8aa -s ours am: 2701e8074c -s ours
[automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 am: 53c6a79cfd -s ours am: b38b3eaccb -s ours am: 7ca38bea98 -s ours am: 2f75f308be -s ours am: ea1b568787 -s ours am: 011c642e50 -s ours am: 6a929ac60f -s ours am: ddfe26363b -s ours am: 577353e9d1 -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions