commit | 941d5425e0644203e9a3942f8026f9e3a1faea19 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Dec 05 22:19:55 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Dec 05 22:19:55 2020 +0000 |
tree | e1fd5c9113c23e3dfe3dd13a402374634a65a958 | |
parent | 1a2608e635bef59636ed8e8db69a4992590d8dcd [diff] | |
parent | 640a7ef39582bc3b144d83d643958e9e887ec15c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fdbeaf63ec -s ours am: 9fb7a90dbc -s ours am: 640a7ef395 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519345 Change-Id: I5106d89a562897e4d74e690ba3ea76167c9f12ba