commit | d5948254ff97ec68c0c8c7a68c62fc11048df8ef | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Aug 21 05:01:14 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 21 05:01:14 2020 +0000 |
tree | 2257855a6b730e3f76cfda8887b43ac0ff2b9d15 | |
parent | ed539a474dd1cc7629118935db0b8095e6346b2c [diff] | |
parent | e5933bbcf05078bb4ed680ee437ee401e7d40aee [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b34be5ef1c -s ours am: e5933bbcf0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12420678 Change-Id: I1e1b54cd6af0b0c67d2f20b6a5201af69afb9311