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