commit | 361353f28b0b12d913dcdb5d01d88643387d1211 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Apr 12 21:23:25 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 12 21:23:25 2021 +0000 |
tree | 931d388be2e8bfea13121c465eb08d90e278f383 | |
parent | 78f9593ff7ac6358e3f6a2b76f9654af0da0ac7c [diff] | |
parent | b4c4f6d65eb10ae156f119ad832b4133b39d84e8 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b4c4f6d65e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14162029 Change-Id: Ie4c6eb66645745102f6ee818bd3694a87a98696d