commit | ea4001c008a0efb638db43364abe9862e754bf4a | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Sep 05 15:11:37 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 05 15:11:37 2020 +0000 |
tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 | |
parent | 6d0e95571afaba05adda00264287b22fbadf6c3e [diff] | |
parent | 3330dc7d384c6ffb8be854b3222be310395dfb97 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4d541332f9 -s ours am: d2b82ac688 -s ours am: 3ebfd0e7e9 -s ours am: 3330dc7d38 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420419 Change-Id: I521d0b6ef93e4353284c6441eb3d3d3a58a2d825