commit | 895e02110043279bbb5899fc9cd56c4f89a9ee3d | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Oct 09 04:22:43 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 09 04:22:43 2020 +0000 |
tree | d7688c08935d8642b4ae03794e1b5e1210ff9493 | |
parent | 71981d8468333a8ad5cd988f67c44755d407d607 [diff] | |
parent | 838bc9752bbdae68806ceb614d722f42eda93cba [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1015bae311 -s ours am: 838bc9752b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12796397 Change-Id: I178ffd2c2615aca479190fc9a30af1a27692e2ee