commit | 75cec2db9e66954242e06182e6fe6f734e8529bf | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Sep 06 06:49:05 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 06 06:49:05 2020 +0000 |
tree | bee7682b401932290b0a8affa3cc0dc1a12c099b | |
parent | 028ad0a064ab10119539bb67fdab0dc6df55bb4b [diff] | |
parent | 5530f0926918dbbe7c7500f71425273022ab072b [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e012e327c7 -s ours am: 5530f09269 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420005 Change-Id: I444bb656f440dcd20a5922cc5807faf577271da8