commit | 725037d02aaf2fbb34c9cfb949511242163579c5 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Dec 06 00:58:01 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Dec 06 00:58:01 2020 +0000 |
tree | 7652ac3d66acf9b55fe6815121dd2219e2c8716a | |
parent | 1d50e2b3c91226e22387072e50166fc568e61f72 [diff] | |
parent | 9d42ce687cc7e0782dc579d22fa0f7855ce6ea09 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6fb53d53d4 -s ours am: 9d42ce687c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519349 Change-Id: Ia3f3b928d3069cfbd1daea1d89bb7309bdb59562