commit | d273e7421d74c728511781d691921b6b42d15b9d | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jul 29 16:06:48 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 29 16:06:48 2021 +0000 |
tree | 59f82a0309d59e8a37ef39804e545ace6aa8f63f | |
parent | 27353ab9b3717ea3954568042d93053c68d7a24f [diff] | |
parent | 61ca353bc2c07ef75097949195da933bc844a8fa [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 45c7e3679f -s ours am: a92b2e2e53 -s ours am: 61ca353bc2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405283 Change-Id: I8dd5a8104d6a74a24453ad60b723974f3cde4586