commit | fcfe705e04040944a8311599f4b391b009eae79b | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Jun 12 10:32:33 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jun 12 10:32:33 2021 +0000 |
tree | c5f01c97eee3b2d3a8808414ffee9a779bf8b1dd | |
parent | 4ed329b64689abbd300347030120ee1d994172d2 [diff] | |
parent | cbce476bb606cb284a9d02c0e48ba94d0e8f5d9a [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: cbce476bb6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946278 Change-Id: I08ba1d2f6f86acfd8327fb66bf22c9e56f70ebd8