commit | 6308a42711158c07688ca9bf8f50ca2305e65080 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jul 01 13:50:12 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 01 13:50:12 2021 +0000 |
tree | 96cb551a2b2f50fa48a4653b84f22d6b47411233 | |
parent | f402cc557d0fbd82367bfb76f496e0b914541d62 [diff] | |
parent | a6484d6a1b908bb57bccccc25e0fe750155446fd [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0a4e48b640 -s ours am: a6484d6a1b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15159170 Change-Id: I823329a96f19f8701bdf47d91ec728511fa7cea5