commit | eed1931f4b81422ff04eac8a132b12f4cb9460ab | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Oct 31 03:10:49 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 31 03:10:49 2020 +0000 |
tree | 3353407d0dd86372090d17109b03f1f4237d7f8e | |
parent | 6acfa90ddd52bf2958cdd20a456f8577423b14f3 [diff] | |
parent | 8ea3acc48296cecf32c54c0a423af910e1010e2f [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: b630b27967 -s ours am: 8ea3acc482 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12960639 Change-Id: If1cda1a5ec3cead1ce1feb39dea6646720674903