commit | c2605fa581385df9f28214f4edf477ede4129298 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Dec 06 16:14:38 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Dec 06 16:14:38 2020 +0000 |
tree | 7652ac3d66acf9b55fe6815121dd2219e2c8716a | |
parent | b6bec330c2d1d564b31d50460b36ac5834826b00 [diff] | |
parent | c11efe23f0375a9f0211159b4d815c91d0b1065f [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 13eeaecc9d -s ours am: c11efe23f0 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519355 Change-Id: I15a8a69e3b0394ec18cafcd1c21666d12aa0a535