| commit | 5b689c1be77be4a1c496f4910b93f47d8ae96d94 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Dec 04 11:34:20 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 04 11:34:20 2020 +0000 |
| tree | d3000bfb4d4c4f04b6817c49135379cfcc57c02e | |
| parent | 649f5348bd537decac6848b69962c89f5b5474ca [diff] | |
| parent | 3bad338b3a340f99197085733f13dd84c546d2b0 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c76e2568f4 -s ours am: 3bad338b3a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13167187 Change-Id: If0c96af3291f8f087a429026b77550b5c51e7620