commit | b68e4631fcabfef36496a2e1be664ecf8f20ed57 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Aug 08 02:34:11 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 08 02:34:11 2021 +0000 |
tree | 04dbe191dc594a6891dfe5e048004b74d60e4511 | |
parent | d7f47ec0e9f994c4fdbda08565830e17c96ec364 [diff] | |
parent | ade0f3605c3fcdbfb24fd8f771ba31ec5c1a42c7 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 07d017a5a0 -s ours am: 00f6f3d8e0 -s ours am: ade0f3605c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15489838 Change-Id: I487a7ce89f434f46a0bf7d8c4daf879bbf65c8a0