| commit | 117d107e25d9594519a8d1141c39dba08d415d2d | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jul 29 16:07:00 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 29 16:07:00 2021 +0000 |
| tree | 59f82a0309d59e8a37ef39804e545ace6aa8f63f | |
| parent | d273e7421d74c728511781d691921b6b42d15b9d [diff] | |
| parent | f8677fd7f4f4c30de264cacae2b8e30eb2bf5953 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 2032a34d12 -s ours am: 1be8f48150 -s ours am: f8677fd7f4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15413212 Change-Id: I74dc46579ba08085573086804c03a6ee38e5770b