commit | cac0ee69a46023cb2247ad8854c5bed74ca7f0a8 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 05:54:28 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 05:54:28 2020 +0000 |
tree | c6f870565fd1d6f49cd79e8075d68ca6d42ac72c | |
parent | a63c57623b8473941969ce33d1e75ac32508d5fd [diff] | |
parent | e6218fa7d977574d7db65a84d0b3e0399979f214 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: fb5578f1b5 -s ours am: 821265b102 -s ours am: 296eca58b8 -s ours am: e6218fa7d9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515618 Change-Id: I93c1a30d87601f8e3880f4a88fb3a18a5ac6aa9f