commit | e445a9438de0d31e7806d48467e9d5865f175f82 | [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 | bee7682b401932290b0a8affa3cc0dc1a12c099b | |
parent | 75cec2db9e66954242e06182e6fe6f734e8529bf [diff] | |
parent | b26a82e2129e619038f7216fdbab80e26b776059 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a2418b59c7 -s ours am: b26a82e212 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420007 Change-Id: I7815cf85faa06b0331044e5b4ffd2561d2ec97c1