commit | 8dd48c609a54af4cc45b3b4af825f998667f5594 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 04 08:20:18 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 04 08:20:18 2020 +0000 |
tree | faa2874e67fc4d971e2d00a7a5515aa1f0596076 | |
parent | 97714cd3529601ff5d0721795e46c2ba4d6743f1 [diff] | |
parent | 6f6a5e1c85354870a87a7deaef1b9bd3c8197807 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5cadaf83db -s ours am: 1438e6df82 -s ours am: 6f6a5e1c85 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419988 Change-Id: I8c66a7a2f6a2e9bf226833e7715b77961b94b3db