Sign in
android
/
platform
/
external
/
jackson-core
/
refs/heads/android12-d1-s2-release
/
.
/
.gitattributes
blob: 4cf2927d3ac5db4059780c8c348546bf2fa1a42c [
file
] [
log
] [
blame
]
# Do not merge `pom.xml` from older version, as it will typically conflict
pom
.
xml merge
=
ours
