| commit | fd9c6af47d399eee566614e1d4673fd2596f1f21 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Apr 12 06:40:40 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 12 06:40:40 2021 +0000 |
| tree | b68d9d8abb15f933c549633519b56f7481650648 | |
| parent | b1858faaab228070bbe844f8eefaae48af551849 [diff] | |
| parent | 30e7ed24cccc7b7dd66342e5f19d3ff1cc314cfa [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c97e512117 -s ours am: 30e7ed24cc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14158288 Change-Id: Ied97563973f212b04cfc123c1609e6cad4cff3eb