| commit | 4a6d73163daf175570ccaf7627fc9cfce5abdc03 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 21:37:09 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 21:37:09 2020 +0000 |
| tree | cd718767c427e59f3f10866408ca5b8fe6d95be4 | |
| parent | d5d15f6dd9e1e4863a107ecedbc0e85157807d06 [diff] | |
| parent | 163ee415d395a756fd06d02b32a7402e2b34f276 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: eddce3d73f -s ours am: fad6fe50e1 -s ours am: bd71815c7b -s ours am: f38f1e5556 -s ours am: 163ee415d3 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420155 Change-Id: I0a2e88da93c0001456f7c145fe515904f48e09db