diff options
| author | 2023-03-28 03:45:16 +0000 | |
|---|---|---|
| committer | 2023-03-28 03:45:16 +0000 | |
| commit | a3a609cafb9584bcec5c7e02624820bfae3aa2c4 (patch) | |
| tree | 58a0801029dd27b445489ab9b1791cb65c857b31 /libs/androidfw/StringPool.cpp | |
| parent | fd19f0b30aab40a9f82dc88d5cbb6cdd33e64a49 (diff) | |
| parent | 66f2dd3473706afa524c20dd03f2c706ac19349f (diff) | |
Merge changes from topic "am-9386409e3b7d4599ba7fc5332a9434f8" into tm-qpr-dev-plus-aosp
* changes:
[automerger skipped] Use PendingIntent for media click action over lockscreen am: 223e9c5839 am: 75f57c45cc -s ours am: 99ad7f0a47 -s ours
[automerger skipped] Update ActivityIntentHelper to use PendingIntents directly am: 3ee3b7a20a am: 8dfe2fbc5f -s ours am: 5290b8db67 -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions