commit | ff89071529a702c80782ca334a64a2abe1a2029d | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Sep 05 14:54:13 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 05 14:54:13 2020 +0000 |
tree | c9e5cc728e671a5de21b72d7c756453b05db63ef | |
parent | ebb36999e2df11aa6a512ccd784e0e816fd4b0a9 [diff] | |
parent | 161dfbf4673a58b3b5ad14e31197783b8d59c1ec [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 730089156f -s ours am: 32bcd97325 -s ours am: 161dfbf467 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420418 Change-Id: Ibd5c6c0719daae9a12ba0db8ebee302c91c7eb9d