commit | b5be1e37442150642909cd8c1bba7339f9cb34cf | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 09:09:41 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 09:09:41 2020 +0000 |
tree | c0b93d439cb39b9eb973b3144b23658ed8f96137 | |
parent | 4a67c2de34711cf1d5346ae11b4bbb374698897e [diff] | |
parent | a6df809312e12eb7f72395af376f582a295c6599 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8d1d77925d -s ours am: a6df809312 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12518498 Change-Id: I92c69213455d33f11f29d0e6f3317b99120e2771