commit | e2871ab0ff8fb260d021cdae1b373f755dc570bf | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Sep 24 20:38:48 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 24 20:38:48 2021 +0000 |
tree | d94f23aa166d55070a99ac2006080d5639b8f4d0 | |
parent | 01e6e5780bdec6dbf20fd9deeab16ee2ca1c4727 [diff] | |
parent | 939547f7f5dc74d0a0ad8e7fbd77c92bbe044da3 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 939547f7f5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15898290 Change-Id: I17f0b266787d91d23dea0728da3fe6f8fe741a0e