commit | 18dee2278cc3022d9102a8d6331e3cf7063d427b | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Sep 05 00:26:48 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 05 00:26:48 2020 +0000 |
tree | bee7682b401932290b0a8affa3cc0dc1a12c099b | |
parent | 8e651630ca69572457e064272de8baf6247067fe [diff] | |
parent | 0d88970647a35a6c2f1f067db3d015b36f9e7933 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d3d24c10d5 -s ours am: 0d88970647 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420253 Change-Id: Iefc8d3bc641fd1e23bdbb63c26e6223061934cfd