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