commit | e8dfd91dbf8497ae67239141d1bbeaf03d054ebc | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Sep 02 16:37:46 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 16:37:46 2020 +0000 |
tree | f2d6c4077bc35ce34b940c85a135bb312bf07d67 | |
parent | 24c7da72ea428bfe6e08ec9d4b81b9147b8f8338 [diff] | |
parent | 372c5529d380690afc28ff53b815dd1d86258957 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b1f16b637e -s ours am: 372c5529d3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12508778 Change-Id: I3ae54ba86027d0516f2e74b63928691d935ae3c7