commit | c6ac3642f3aaf2a4554238ad76f3fde03957d552 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Sep 06 06:49:13 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 06 06:49:13 2020 +0000 |
tree | 90d8061def99099e464e6d125efd08f3bc13f246 | |
parent | 7243e173c1d9e2e0fd8635bd2f69417ade593d7e [diff] | |
parent | 097abd5f983ad2283d6e65ad40ae800039d87628 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5db7c0028c -s ours am: 097abd5f98 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420007 Change-Id: I7815cf85faa06b0331044e5b4ffd2561d2ec97c1