commit | 52caa30660848041e5572fc8a518a23093779fd9 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Sep 20 16:38:12 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 20 16:38:12 2021 +0000 |
tree | dd5b3f5b73c9f809dcc15e874d1746fec3ede9cb | |
parent | cc0b58d95c65bb3c46eb7d24e4b1948e178e85d4 [diff] | |
parent | 2e0d345259aab5cf0657e5e4023114e973f020b7 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bc20e0661d -s ours am: a101528b8c -s ours am: e998e6f0e5 -s ours am: 2e0d345259 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15860546 Change-Id: I78cf922713815785970cfb707f7fc6c564b9c8fb