commit | bd39b0abb4dc9670d9c408233bdacef400bc2ae5 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Dec 04 22:12:03 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 04 22:12:03 2020 +0000 |
tree | 6d1922836ba6242f56c37813aea590fe705ba68b | |
parent | a5a6764e735de25b6dd92b1fbb61a905443b8b30 [diff] | |
parent | ff565d3f399d4b386f7ef1e98b7208db2a263350 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: ff565d3f39 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13167384 Change-Id: I517a9fca9e4f0bab06d47d8965652fb312e93857