commit | b428e8f992b858cc21ea8c012b32050a123ce160 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Sep 02 18:09:52 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 18:09:52 2020 +0000 |
tree | 5db9ae1906438971c6992ef795850542ab8ef969 | |
parent | 16a06649db77c9346db207252262db51112f445d [diff] | |
parent | eb57d4f0843dc6815e88ca524dfb3c8b43d6ccde [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: dd326a21d4 -s ours am: 398c2db050 -s ours am: 24c7da72ea -s ours am: eb57d4f084 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12508892 Change-Id: I090a9c82b8ffb9c6e90a21f907414b767db36bf7