commit | 0e139daafea1fdc38f066b76d84e2e8083dc81ec | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Jun 15 14:30:25 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 15 14:30:25 2021 +0000 |
tree | dcbdb49e6139ffaf197b17b93d3aef6e3242b2f5 | |
parent | 482a5edcc8894eb5dde4cde0b53a1ec9951807b2 [diff] | |
parent | c723111fbb4ec5dc91e42ac872ab7b6e77ea7155 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: c723111fbb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14974989 Change-Id: Ia2ceceb7f5def37ba97e354c150cf95c0ec0045e