commit | 4551493131f0348ec28a01eb27f4b5d17e18550b | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Apr 09 22:36:38 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 09 22:36:38 2021 +0000 |
tree | 40c9a278ce9e593cc04842674a86e9ade4c8c76e | |
parent | c710b22dda90ce3c08f7cac1cd59f353518385ea [diff] | |
parent | 6aec468bffea36ca1b8847609706b1c97c02f6e7 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6aec468bff -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14143763 Change-Id: If4e851287152ff1e506fd11c1e7740eab68f18fb