| commit | a13c7092db0993dc1e0bc2279503b0efce928324 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Dec 13 20:10:45 2024 -0800 |
| committer | Xin Li <delphij@google.com> | Fri Dec 13 20:10:45 2024 -0800 |
| tree | 2511ff8dee4c5ef27b206805a57d72d0dfe7dc22 | |
| parent | 7b1f850c50427ff38c20c83721c2e7aa173e62c2 [diff] |
Fix a mismerge by removing duplicated flag for improved wallet role icon This should have been skipped by automerger; however we missed it due to an unrelated merge conflict and git merge have applied the change because it did not cause a conflict itself. The rest of aosp/3414381 was merged correctly. Bug: 349942654 Merged-In: I5f91668aca93fcba963e046b7f26345f40a0c6f3 Change-Id: Ia8c7a741172be4a4da787c52dfa4d4f5dd9af4c1