commit | f496d4bd701ef482ca4e072113811a1fe23b0cae | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Aug 28 08:48:41 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Aug 28 08:48:41 2021 +0000 |
tree | 8ec2e4568130d4bdbdf0a8b1858ed6db6d26a4ea | |
parent | c85ce91c8df2ddc45bc65eb410b51fbf4172cf1c [diff] | |
parent | 5738b157c02192b60816b4034bf0920d15951fe3 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 3136ec7b40 -s ours am: 8a48ffefc0 -s ours am: 5738b157c0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15693271 Change-Id: I680fbb6f1d658fb28bee1b88517002ef5f3e887c