diff options
| author | 2023-07-06 22:11:56 +0000 | |
|---|---|---|
| committer | 2023-07-06 22:11:56 +0000 | |
| commit | 6f886d17fb1db2d533398c66414240d520783f1f (patch) | |
| tree | 8a4a2f3ac7c51741c05af23177dd6c09a75cbbd5 /libs/androidfw/ObbFile.cpp | |
| parent | 08f55891569789616af739182691c2cd20d9daaf (diff) | |
| parent | d71766972f734b0730d3b3b1b1eb4e33832501c1 (diff) | |
[automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into sc-v2-dev am: 94f3527c81 -s ours am: ba518abf4f -s ours am: 8dcec5292a -s ours am: 73cb2d52eb -s ours am: d71766972f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23818592
Change-Id: I0a478c92a871a50c282d7d0a7d6b57319a8d53d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions