commit | bbd84dfff49c50ff592aca0833f8677585305993 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Apr 10 05:25:28 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Apr 10 05:25:28 2021 +0000 |
tree | 666942b9e892bb01ba2e16d850f50642b2222129 | |
parent | 77999ac695c828d44eab9621fa9ac08cf618a652 [diff] | |
parent | 8dc1bc6cbc21f93522b90fa612e4ab4db3078b77 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f5693e6cdc -s ours am: 8dc1bc6cbc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14143086 Change-Id: If959258019ead34e25536f745b688f990dd82e9a