commit | a8f040000ababc24e22b2a59d22f1a8aa3d193bd | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 22 20:03:11 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 20:03:11 2021 +0000 |
tree | d58738d16db3c8c50d1ae4046091c0737c99d05b | |
parent | 244ea9491610874237d6a7ff0f6ae92f5628bccd [diff] | |
parent | 7234450a5c1c99091e2ff4d9c34898b2c9172b5d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 9a162a8125 -s ours am: 9cc9dfb807 -s ours am: 7234450a5c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684925 Change-Id: Iee64623f84a886d5d8eb5d71f87c934cfb59cf7c