diff options
| author | 2022-08-02 13:54:51 +0000 | |
|---|---|---|
| committer | 2022-08-02 14:05:08 +0000 | |
| commit | 518980587b07447894e9176157f2ea38ae106c2b (patch) | |
| tree | d1b2d8a6d8c26894376985be9dcfa641c13aba60 /libs/androidfw/Util.cpp | |
| parent | 7330570922cafe612204b516394612d8b5ac9ec3 (diff) | |
RESTRICT AUTOMERGE: Fix build breakage from merge conflict.
Merging 8ce3c53fcf641e4bcec73376542767bbc04e79a1 into qt-qpr1-dev resulted in a merge conflict due to a method being moved between qt-qpr1-dev and rvc-dev, such that the patch backported from rvc-dev didn't match at all. Removing the old method makes this branch match qt-dev and rvc-dev.
Test: will use abtd to validate the build and the resulting logic.
Original changes: Id82d20c9f1f2001400871b5381f52b40fbdf81c5
Original
Bug: 231322873
Breakage
Bug: 241087006
Change-Id: Ic4f8d701d97aa9b6c72875df8c7eab5fd51934e0
Diffstat (limited to 'libs/androidfw/Util.cpp')
0 files changed, 0 insertions, 0 deletions