commit | 3f0ba7f95d1f263d587539bf7d6f02733eda74c3 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 19:05:58 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 19:05:58 2020 +0000 |
tree | bee7682b401932290b0a8affa3cc0dc1a12c099b | |
parent | 1bb4d35d5dee058e56072b73801469aa08f4e8d6 [diff] | |
parent | 0b757ad8cc47f78ad7f22d287d2377296fa3d429 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1a32ff0e6e -s ours am: 0b757ad8cc -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419938 Change-Id: If872efe1ef0d0239020590dfffc44f2289949956