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