commit | 27955484a4345770e0a9bd1c422fb86e3bd43d3e | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 11:11:01 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 11:11:01 2020 +0000 |
tree | d071c12d33cd7bd89ec76b00223e794b2b06c2c8 | |
parent | ebf0113be08875667b7c2798d9af320448707f8f [diff] | |
parent | e4321e73593325c89fdf9b8b82ab12d190d1c5ce [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e941db9ff2 -s ours am: 2879daa6aa -s ours am: e4321e7359 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513076 Change-Id: Ie04d0e10e68e21f40d66919360e57a293b1fc012