commit | 1d50e2b3c91226e22387072e50166fc568e61f72 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Dec 06 00:00:05 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Dec 06 00:00:05 2020 +0000 |
tree | 7652ac3d66acf9b55fe6815121dd2219e2c8716a | |
parent | 4c6621d4dc5759ea2b566e086125a7f1c57b96ef [diff] | |
parent | 2575bdbf1be43791358cec24ba517f4112d4be17 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1b11e4ca9c -s ours am: 2575bdbf1b -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519348 Change-Id: I0c49989e0de3eca5996cf7cecdb65f77795443d5