diff options
| author | 2025-01-08 08:46:00 -0800 | |
|---|---|---|
| committer | 2025-01-08 12:50:52 -0800 | |
| commit | 56f7037d8e56905fbe3543851a336a602039daaa (patch) | |
| tree | 2faa0d7dcab97c029104476fa3d6f0799155e521 /libs/androidfw/AttributeResolution.cpp | |
| parent | 4b10d20235d577aa77356d438a4069095b624283 (diff) | |
| parent | 6a880e0f7412c04b148c6b8ff5be35695bb8fa23 (diff) | |
[conflict] Merge "Handle static methods in Plugins better." into main am: 086613e083 am: 6a880e0f74
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3440505
Change-Id: Ia91f42f7b00cfbac550dc610eff54ff9c62fafd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions