commit | 214718fbec173ea7582ca44541ec09866a5ab0dd | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Apr 13 18:26:08 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 13 18:26:08 2021 +0000 |
tree | ca3bbc62dac7cdc98d140bdba8432ab936c3033a | |
parent | 735d9fe220f5df5420297b76177431c440553c1f [diff] | |
parent | b4f8703b7dc1c20d2aa60a5d26e8fadddab087f0 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b4f8703b7d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14170578 Change-Id: Ibd900bcd612dfc92643602502387b0ea549c6bbd