commit | 5b3a947698e47cc5bcf8cc180d44d31450ab7f91 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Oct 07 17:52:18 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 07 17:52:18 2020 +0000 |
tree | 43338d6ba26e7d2fda40f72d9cc2696931c84b26 | |
parent | 6e4a7a937f681cdc1715df09ba91023862d2615e [diff] | |
parent | e1b0c1910e1ea65c05b7d396e13d42f95ea2a030 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 2943d70788 -s ours am: 9e0859b765 -s ours am: e1b0c1910e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12782396 Change-Id: I2f549437ab4f26762d03151d81ad1002b95551d9