| commit | b7f10f7ca6843bc420bedf28d55b30652cb23ced | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sun Aug 08 02:46:25 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 08 02:46:25 2021 +0000 |
| tree | 1c9cb2ec3d045c8cc468ed837d84b8e46e661e08 | |
| parent | c4485a1ca421b210e808b079405aa0d6ad51cb7a [diff] | |
| parent | 3afe8b0d1dcd5e8b633ff86b6f663c0cb8a68d4b [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 07d017a5a0 -s ours am: 00f6f3d8e0 -s ours am: f4ecbc4753 -s ours am: 3afe8b0d1d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15489838 Change-Id: Ifabf5e9d838990dc7f99081990b128a0655916e3