commit | 43662e1979b665bb24d1db5123b2b18af66bc97e | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 01:18:49 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 01:18:49 2020 +0000 |
tree | 6fee3fe821504564c1ce21e63aeaa4b25b2e6c78 | |
parent | 3df8d0d16b46ae3e4c73d6b5d25118044746d36c [diff] | |
parent | 493592907d2d7dae531618726afc67080325d67e [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3a301e8671 -s ours am: 493592907d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515857 Change-Id: I51f2312fc476482aede79a76af8a64067db463fa