commit | 3078660c4eb37fb00ad1e69cc695bd20f1ee7440 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <[email protected]> | Mon Jan 04 01:37:09 2021 +0000 |
committer | Automerger Merge Worker <[email protected]> | Mon Jan 04 01:37:09 2021 +0000 |
tree | 3d32c0aca4119a3e2f53495d93af28de453ed26e | |
parent | 239056b86b868bad396d1b777d204b8321c6509c [diff] | |
parent | 26a05032b82bba0aed26a7a4a194f81e3e862316 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 26a05032b8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13283069 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4bf82035631ccff6d5a6144d6d9b1d203b076851