tree 231a875a8482a6cf7ddf5d604135940a720372e5
parent 6013ddb721d549d9b0731b24da4832de6d86a8e2
parent b6a15fd79d8254e5dc798f8e434418e56472df5e
author Treehugger Robot <treehugger-gerrit@google.com> 1599283873 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599283873 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e7cfa488d7 -s ours am: a2c57f54f5 -s ours am: b6a15fd79d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7a61c0ea10c7e4e357a155da48b2e514484ee659