commit | 3afe8b0d1dcd5e8b633ff86b6f663c0cb8a68d4b | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Aug 08 02:34:34 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 08 02:34:34 2021 +0000 |
tree | 04dbe191dc594a6891dfe5e048004b74d60e4511 | |
parent | b68e4631fcabfef36496a2e1be664ecf8f20ed57 [diff] | |
parent | f4ecbc4753be71926a66263a777e4a97a9d8f9f5 [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15489838 Change-Id: I780b570f5468326a0d211a83a60ba2e95412f60a