| commit | b4766c2013d6cbcb3b466bab0709344c15674209 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <[email protected]> | Mon Jan 04 01:52:17 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Mon Jan 04 01:52:17 2021 +0000 |
| tree | 67a919d4e86aedd38f002aabb2a2f1b3bddfbab5 | |
| parent | 2c1a33123a95687f3f9d9c53db74d91850cd435e [diff] | |
| parent | 3078660c4eb37fb00ad1e69cc695bd20f1ee7440 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 26a05032b8 -s ours am: 3078660c4e -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: I0d275c5db67d720f36e05c2457ad28ad0b4e79f5