commit | a2c4d58544a5b6fd777ea0c18b1d80a12598c8e9 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Apr 12 06:12:23 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 12 06:12:23 2021 +0000 |
tree | 6129db95cf21be7de686efe0a5e1c34341928d5a | |
parent | 3e04c952558fcccf86d262950cc3f7e1723ff292 [diff] | |
parent | 204e5e00be74c58a1be22af56bc65da82a4f17de [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 204e5e00be -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14158293 Change-Id: I3f49688a1c9951d212de2870c2b8c1e2fbb447a0