commit | a3172044ca14ae7453bf34113ade5799c76ee451 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sun Jul 18 22:12:10 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jul 18 22:12:10 2021 +0000 |
tree | 93042e524209441677c2309aa7944e7a06a9f0d0 | |
parent | 4197e0b7eb0ad874a3fdf9c86af0d353f3d18876 [diff] | |
parent | 33ff2f38ad281768eb56b75b8f0ffd21d95b0c95 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c18be9fcf4 -s ours am: 33ff2f38ad -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15322561 Change-Id: Ic266f75755a075df88214badf43c85d284be9bea