commit | 707809b7c1e2169aec377f6e00126ef9829df84e | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Apr 13 17:14:40 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 13 17:14:40 2021 +0000 |
tree | 9a087a5c3d990749846db3e2c0c030e763a0b291 | |
parent | aab4dad4aa097e221ba57fda58e8660632ba9c97 [diff] | |
parent | 332ac458068a34522c9a8273ef9a0fa9bd4d1bcb [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c55482fcde -s ours am: cd1edf4e57 -s ours am: 332ac45806 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14172965 Change-Id: I161073b4943b752a101defc52bd93108da6b1d51