diff options
| author | 2024-05-01 00:44:04 +0000 | |
|---|---|---|
| committer | 2024-05-01 21:32:45 +0000 | |
| commit | 0d48020cf75e3b9b0cd52590960e4f97255dff82 (patch) | |
| tree | 3848b7facdd31e5c5a3e9fe6b75fefa251d0d26f /libs/androidfw/StringPool.cpp | |
| parent | 8ea42e5f4af9e6c56e9735cce3c272e745ed1973 (diff) | |
| parent | 7b14b13872743e320b53cab507a8c92c77324138 (diff) | |
Merge "OWNERS: match the adb JNI with the adb Java owners." into main am: 65f47a30cf am: 7b14b13872
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3065925
Change-Id: I9ce004f6fc8c28835e3fdd590ad32aaa7166bf73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Exempt-From-Owners-Approval: Fixing conflict in OWNERS file
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions