diff options
| author | 2022-10-04 00:58:31 +0000 | |
|---|---|---|
| committer | 2022-10-04 00:58:31 +0000 | |
| commit | ac4bb89aaa4597ef643c9c747e2729306d5ab374 (patch) | |
| tree | 90a28b998ac92535bd2f0bf5505668a4759f1f55 /libs/androidfw/StringPool.cpp | |
| parent | 07cf280e1d05b91222aa5d8216fc1fbe4535c59a (diff) | |
| parent | 02e7e4a385edd7a4341a8592620b9ea3d1c20c4a (diff) | |
[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into qt-dev am: 8a2baf4e16 am: de5113eebd -s ours am: 2fcbfbf644 -s ours am: 725961fbbf -s ours am: d0836243e3 -s ours am: 9f6e9f9f96 -s ours am: 4e12bdc3cd -s ours am: 02e7e4a385 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225
Change-Id: I5fb9aa0ea6786446d46b4e328306609a26359f0c
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