commit | 587aa366bc8b9be8f73f952c0bbd606fc7e5f971 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 19:34:05 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 19:34:05 2020 +0000 |
tree | bee7682b401932290b0a8affa3cc0dc1a12c099b | |
parent | 00264037924798d598e8b002cfb909a60cb6ab4c [diff] | |
parent | e5b03889a1cb1be81879f056ab34d75c0d469930 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a589e31259 -s ours am: e5b03889a1 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419942 Change-Id: I32451992c758610549db5f2955304ae8c96cada0