diff options
| author | 2023-02-23 23:40:18 +0000 | |
|---|---|---|
| committer | 2023-02-23 23:40:18 +0000 | |
| commit | e17f8ea00ff818789335ffe4f74348e7b1f34583 (patch) | |
| tree | 3b9d8171aea671e749b56c011b537ae636afda03 /libs/androidfw/StringPool.cpp | |
| parent | 38d8dcf450b9fa1a2c080168c0d9a6df750bd39d (diff) | |
| parent | 9814416d5d645f1181de08885a61cb8c2df45429 (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: 98210db275 -s ours am: 4e7d4c2c29 -s ours am: 9814416d5d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225
Change-Id: Ie4edbda6e78cc45cb1506f985d9d6c43c35fa019
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