| commit | 9ba16c48070c51317b93f75e1a9f892429b5fa3a | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 08:32:50 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 08:32:50 2020 +0000 |
| tree | c0b93d439cb39b9eb973b3144b23658ed8f96137 | |
| parent | 828a6a935e35e42805d45c882314afc5a9df3b66 [diff] | |
| parent | 252c0e747325fbd2845d05cd18897f99c972791e [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1051ed16e7 -s ours am: 252c0e7473 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12516627 Change-Id: I965d54154400037ade9f081e587026218d939fd3