commit | 2c1a33123a95687f3f9d9c53db74d91850cd435e | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <[email protected]> | Mon Jan 04 01:52:04 2021 +0000 |
committer | Automerger Merge Worker <[email protected]> | Mon Jan 04 01:52:04 2021 +0000 |
tree | 67a919d4e86aedd38f002aabb2a2f1b3bddfbab5 | |
parent | 907611f4b5965ab0179f3a0a1104336333f72995 [diff] | |
parent | 239056b86b868bad396d1b777d204b8321c6509c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6d64f4aee5 -s ours am: 239056b86b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13281573 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie9676084610905f496454bfb0efc916936c4a721