commit | 0544e627bc7b73dbc522829973e9ddda4d121d80 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Oct 05 23:40:50 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 05 23:40:50 2020 +0000 |
tree | 3d5aa15cee726e96d17d0a7e935408e75dd12b01 | |
parent | b78a5ccc53845efd36b24d561d5c9d3cd639afa6 [diff] | |
parent | d0fc9d92e9d46ac49eae317290debf321857c8b2 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d0fc9d92e9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12764984 Change-Id: I8f1f3f36f455cafd917aea8cf916206868c64af7