commit | 79df6b40efe6137bbeb7db21ad01570a89986d0d | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri May 07 17:13:27 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 07 17:13:27 2021 +0000 |
tree | cc90206ac6a4dd8def08e147b6014dc97e3fb2b9 | |
parent | 8ac878739135083c2b65d9e4d3d156f37aa3d7a6 [diff] | |
parent | cbcb112338ec63192420ce26d9db58d5deb1cd9c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: cbcb112338 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14464325 Change-Id: I60121549c8c5a2e36bc0891bd465dbf430966321