| commit | c47dbf6129414cae4afb1e67d40c27f594e77abe | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sun Jul 04 20:56:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jul 04 20:56:22 2021 +0000 |
| tree | 57d66b8be657814f24572e321469174e7c072680 | |
| parent | 0b61471dc0dc71b6dea1aa5ae8a2b21a24f26848 [diff] | |
| parent | e0a12523ae9b01d1096e1f3babdea5ae687d21a2 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5d2afa5b1d -s ours am: d643fed6ed -s ours am: 50c1bb1464 -s ours am: e0a12523ae -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15179771 Change-Id: I8a745d9e6a0d8537dd7f5b864d936e265626a798