commit | d1ed3db8a0e64384713982171ecca475924316ac | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Sep 05 00:53:02 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 05 00:53:02 2020 +0000 |
tree | c9e5cc728e671a5de21b72d7c756453b05db63ef | |
parent | f61752a5f4604ae5533a20530cb3677b08c62dda [diff] | |
parent | 5481fa78373bd477fcfecf35f49d468719d36686 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 59abb4f816 -s ours am: 93fb60e626 -s ours am: 5481fa7837 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420249 Change-Id: I4109d5442b5c48a1a9615e1f177f74c0e154b3a8