| commit | 9006d3060d19ca6a1371b306f3eeccda60713196 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Apr 13 17:01:31 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 13 17:01:31 2021 +0000 |
| tree | 949d3b83d38b8e7890aa86d9bee78766689334eb | |
| parent | 27d7036612270cd97f391c2555bc76a2e2013799 [diff] | |
| parent | fc8d11d4316af489ef854568c4f9bc1679f0613a [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 79b99b4cc7 -s ours am: fc8d11d431 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14173308 Change-Id: I3818a861a037294c7494f977a497dd368a24abe6