commit | c08dd11c2249b5b8984d14c1921fb6a32288b9a1 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Sep 02 18:44:50 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 18:44:50 2020 +0000 |
tree | f2d6c4077bc35ce34b940c85a135bb312bf07d67 | |
parent | bf9c988a604e52054d9e7ab29a03f3862e7f921d [diff] | |
parent | b89c6d94c58f65a44b84f0402c9c659da10f01b5 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f59fa9f9bb -s ours am: b89c6d94c5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12512963 Change-Id: I5406e9ab575cd4c84182191c025982c08042081c