commit | cefdf900e4bc1f4830c56880871e0b0709535d63 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Sep 12 13:54:37 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 12 13:54:37 2021 +0000 |
tree | bc163ba196ce38ad2b7503cfa740bb3f8db2fec7 | |
parent | 95585b047885afab561c6f4cf03d114b602f28b7 [diff] | |
parent | f9e3c1f63dbf578b7c559d6d3a5aefb137978289 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 1c5b9275b5 -s ours am: 8aa7ec2240 -s ours am: 55949d180c -s ours am: f9e3c1f63d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15807887 Change-Id: I696863f0264330d4dbef497fc994f1777dc66611