commit | f3fd6cd7ef441fddb3ab6868183e091a00bed705 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Dec 06 16:56:49 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Dec 06 16:56:49 2020 +0000 |
tree | ba6c3bc9147c41b0b3d62f48824d83f5832ad5cc | |
parent | 0de544c1a78a48eb147ad9263a9b10f28b385488 [diff] | |
parent | 01a0745efd93564c6db8dfe1497a5e3370adcb82 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: dbd5232609 -s ours am: 7b6d6070bc -s ours am: 01a0745efd -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519353 Change-Id: I3a04435f2152b391460901aaebd6b77d1090cddc