commit | c38b38ba90bec35dba3b1b753b2780bfce8ce3ac | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Aug 13 23:17:52 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 23:17:52 2021 +0000 |
tree | c020888716c02a74aba896b2cd710b6abcf4db42 | |
parent | fa756b63183cca1ba494eb74daf600c1dd11ec59 [diff] | |
parent | a4712801b45cf6ea3279f37039673820f0c9042a [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a0d9ef7e -s ours am: 2e0c1a0555 -s ours am: a4712801b4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15543339 Change-Id: I1f2db1232f3ad65387e42b51a9c4891afb2785c2