diff options
| author | 2022-10-04 02:02:05 +0000 | |
|---|---|---|
| committer | 2022-10-04 02:02:05 +0000 | |
| commit | 4f0dcf7302de028501775dd97a8579946b80d5cb (patch) | |
| tree | d16bb628a283c83822a5e673ef6e21c6b01b7679 /tools/aapt2/SdkConstants.cpp | |
| parent | 246f06349b385d37a64986821e9dabf80832584c (diff) | |
| parent | 366784f25681c1306cb8e5d847ca7ed94e6b74f9 (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: ac4bb89aaa -s ours am: 366784f256 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20015225
Change-Id: I375a07c598281acdb6332088148a0347b1f1fe70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/SdkConstants.cpp')
0 files changed, 0 insertions, 0 deletions