commit | 4c6621d4dc5759ea2b566e086125a7f1c57b96ef | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Dec 05 21:22:44 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Dec 05 21:22:44 2020 +0000 |
tree | 7652ac3d66acf9b55fe6815121dd2219e2c8716a | |
parent | 640a7ef39582bc3b144d83d643958e9e887ec15c [diff] | |
parent | 4b4ae360928bf9a7dc678b90379bd9823215df08 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8816df37e4 -s ours am: 4b4ae36092 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519346 Change-Id: I1112784e8cf6c0f1f4c9a240b6fd97f2d50ca252