commit | e4ee99b6ce8828b2954396d340b9fe279ade2266 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Aug 17 21:03:43 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 17 21:03:43 2021 +0000 |
tree | 0361b932665ca04e15d9e74e7834ebebe948fbd9 | |
parent | 71e02e9318ccfeeaeac9e8a00c95dc016a309206 [diff] | |
parent | 9b2132ad58bc6c7dd3ba013330fba0dc30b6fb7b [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 68e3878944 -s ours am: 9b2132ad58 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590111 Change-Id: I7efaa13b40afd41002f56d6a558fc9f63caf15bf