commit | cd548ffab2c4e8b70080f1d8776c50ce272a27f2 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 22 17:12:23 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 17:12:23 2021 +0000 |
tree | ce7f4ef12224ad878f43cfe81858d66c70b2e5e6 | |
parent | 28ccf9bf8e3d9cbe49df9098d095a4c63885ff95 [diff] | |
parent | ea6d47bd9545bea94a1fa74ff9a05ad1c564647c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ea6d47bd95 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684627 Change-Id: Iffb9ee500fce82247dbddb222bf26b5a78cae8a4