commit | 81c0905c57969d201222d1e2c792b95cfb7ceedb | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Sep 02 16:37:12 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 16:37:12 2020 +0000 |
tree | f2d6c4077bc35ce34b940c85a135bb312bf07d67 | |
parent | ed87582c20d223e4452a3929a09f99a83e9ccb5b [diff] | |
parent | 921f98c7883e787166b53f0a8cc075af186ba937 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 051a24c592 -s ours am: 921f98c788 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12508633 Change-Id: Ice1a549330ca55b6bee9368d47362117280585e9