tree f338c9fa2c238a81e39d101bc5bb0c83ca947742
parent 598f07cde22fe91583da563eeb0288c7eeeab7c3
parent 2408a23918981a4939137b53138e6020e19cda73
author Treehugger Robot <treehugger-gerrit@google.com> 1646851465 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646851465 +0000

Merge "Correct name of gitattributes file" am: 2408a23918

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/2018055

Change-Id: I5dada06310cb2e7cf5ef24960bbfb7cb7a3022a6