commit | 3baf59027711af8984a5b56eb538b2d914a99b96 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat May 22 07:00:44 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 22 07:00:44 2021 +0000 |
tree | 43fa844f6617b3ad57a69de1310d892e91d25c08 | |
parent | d3926f73757e08029691ead644796de802cd7b41 [diff] | |
parent | e7d5b523d8f75f0c862cfc0f45956b8d1f91f9b5 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: cb993ce24a -s ours am: e7d5b523d8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14687243 Change-Id: I3eeee6fcbfaac6948a847d82e9055c120c312371