commit | 3cae0bca5762e147b0871eb9fcb47c4329324684 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Aug 18 00:02:07 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 18 00:02:07 2021 +0000 |
tree | 270110c03f68a1d5b5e475f26324a24579f01cec | |
parent | d0ae6bd68c7406c8d27f8985eb4ff7f1bc489367 [diff] | |
parent | 2f6334e0f8f4cafca3e6c7f2ac7a9201b8f2489b [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8c0686e702 -s ours am: 2f6334e0f8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590964 Change-Id: Ic1ba100507b292483e547cbd95a4975d52a20f1f