commit | 69227f0bfada8ed2920cb4796b86c5e1e1afe83e | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 16:11:54 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 16:11:54 2020 +0000 |
tree | 90d8061def99099e464e6d125efd08f3bc13f246 | |
parent | 69a5e083ef719516c1a337c478588b1b739167c9 [diff] | |
parent | 97556601154cd593e956c20cf2214605e748de25 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours am: e895502223 -s ours am: 9755660115 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250 Change-Id: Ifc747069b8f3a643bec3b9035eb9545d11b4379b