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