commit | 167087df8a5f33d21e33b61037f7146bc45ae031 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Aug 29 20:29:05 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 29 20:29:05 2021 +0000 |
tree | 50eecd2e5dd2153f190b4f40ccae7f5d7984bddc | |
parent | 07975efe0982d397b1ddc69593b761dda4659d99 [diff] | |
parent | 604ebcba4bd54c71c844f6ab12c87a444f8c79e1 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 604ebcba4b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15692156 Change-Id: I96f76e07412df6fb72e47eb3d206a198099636ee