commit | dcfe628abd00f5cf5fdd83c39243f6e9c52fee79 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Apr 12 06:13:25 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 12 06:13:25 2021 +0000 |
tree | 6129db95cf21be7de686efe0a5e1c34341928d5a | |
parent | e0ded72ce8d9a743266b0268911c1402887ee9c1 [diff] | |
parent | ebe037549be8416698ff76e395bb8c95e99028c5 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: ebe037549b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14158287 Change-Id: I59d17aedb37fc8f47acecc72c2008643a15ebfb7