commit | 9c2d89b1232805f87a680efb26ace9222b5d3ad9 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Oct 05 16:00:51 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 05 16:00:51 2020 +0000 |
tree | 0c029ad1b5822ba58f41827a57520a1029023981 | |
parent | 79dff73fcc0e894d8f57deeb4bc385edbe15a8c5 [diff] | |
parent | 54c37b2e14a5004ac0e7d606c9904a005faf3d99 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 54c37b2e14 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12759563 Change-Id: I94fc613ef2b488f2c450bc7e9c628b24a8cdf809