commit | 30a3c80b8aeca8824fb993f39829522267789b7a | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Oct 05 15:59:07 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 05 15:59:07 2020 +0000 |
tree | 0c029ad1b5822ba58f41827a57520a1029023981 | |
parent | 523d30f631e1fc7be4692dad9e07d96ea8bcaf3c [diff] | |
parent | a73565777dd07e6b6f562979e234d0b7e2d35529 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a73565777d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12759560 Change-Id: I4f573b8453157733ab672bdb00bb299b74748498