commit | 5d29c1510b7365cf58a6ce2a02bcc14ee33d6c0f | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Oct 07 14:36:05 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 07 14:36:05 2020 +0000 |
tree | e9d822b0fc47f761a7c685499217fda359c5ce72 | |
parent | 5e3cda67607b61479b6a8d2337e077ff6438c5df [diff] | |
parent | aabad94a4d03bb657290b5e9ec2bff63b3e8b853 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: aabad94a4d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779439 Change-Id: I6e56f3f71c87e38ab5a0f2158085193cc7c31812