tree f22823d6864c21c945b82f97f2d342f1fd5a4384
parent a2bd9557f592cf1abe85a2740720b07af679c391
parent d42e01a785509f25012f008d59437b97e753dda5
author Treehugger Robot <treehugger-gerrit@google.com> 1645831740 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1645831740 +0000

Merge "Make sure that textpb files are treated as text" am: e51b12abe7 am: d42e01a785

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

Change-Id: Iec3469dc5d66f4a140bd91ebe1395db9b1a85440