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