commit | 9ebff03fbdc99d867a50f68ce9c2f379913650aa | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Sep 05 05:49:20 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 05 05:49:20 2020 +0000 |
tree | 90d8061def99099e464e6d125efd08f3bc13f246 | |
parent | 80f5ac3388e5ae73ff19597fdd64f8bb05248974 [diff] | |
parent | dc54ae34886a2a957ebbb798f88f9a75d14bf02d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5e2016da9a -s ours am: 44d4d1333c -s ours am: 7243e173c1 -s ours am: dc54ae3488 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420263 Change-Id: Iad566310602f142a484e2cf747baf0dc046bc4f5