commit | 394274894d834748c127ab190ba59194d206d3ae | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Dec 04 21:30:32 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 04 21:30:32 2020 +0000 |
tree | b30b4abb0b8d240b9867c167f53579693faab739 | |
parent | a3504198a377ab51cf650d66580f0c5b18e28cb6 [diff] | |
parent | 9d8b718f2602a934c712da7598564ccff5036496 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9d8b718f26 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13167504 Change-Id: I8083a8e27672705e8f7ed2f34f863d0daae5f916