commit | 80035c6b38cea602705fd2a182819dbb02ab176d | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Jul 31 02:30:43 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jul 31 02:30:43 2021 +0000 |
tree | f80a695689da5bd2605a341bc6f0a90d790665c5 | |
parent | 1162f4ca38eb5cc9d355146735369648bf78c792 [diff] | |
parent | 889a6c48eebd5adb8865413dcfae09d403f90ab1 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9bf0c45e6d -s ours am: b5eba64c2e -s ours am: 889a6c48ee -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433532 Change-Id: I21ff6954267f00ad1969aa9b403d6e6fddb1d132