commit | 680f8a50391018976e8bd0ffce718b6890ccd048 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 09:44:59 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 09:44:59 2020 +0000 |
tree | 6bc1d197a89b4fc8733f35a0d78a7dde37e37be7 | |
parent | 4354e0b08a5b7aad6d854913fc5a2ba5a37652eb [diff] | |
parent | 01a817bd9bd71a36ac1a8bc3375055c5ef3beefc [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6ffba8f337 -s ours am: 222ea67d6b -s ours am: 4a67c2de34 -s ours am: 01a817bd9b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515760 Change-Id: Ibe71b9757bf93f8d703086c807271da384f9024f