| commit | bad7e1870b93e9656a83d7b3cb64abbe4088dee1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 14:08:29 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 14:08:29 2020 +0000 |
| tree | 8319687fc73911705cea79427cc774ec5d2677cc | |
| parent | d1e6339426ea658b020fb350a37c276ea556535b [diff] | |
| parent | aaba5d9d428c9919f3b94e3d4070175461cf91a3 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b983b9dfc3 -s ours am: 37a4aeaadf -s ours am: b7e4b84c3e -s ours am: 225a3b600f -s ours am: aaba5d9d42 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419719 Change-Id: I82ccf0b8743721fd171287f1af497d3f8a9efee1