commit | c65ae4deef7e81b59fda067cc66e27f664758724 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Oct 06 06:20:46 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 06 06:20:46 2020 +0000 |
tree | 017abfe39b195bc7a53e23786e206ea68ff01723 | |
parent | 9e4764431474f90f9207afdacf6681f9a827d7c4 [diff] | |
parent | 16381c8fd5f2da019cdc4ea5d6b794573ead5422 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 16381c8fd5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12769370 Change-Id: I34a4b628ab4688a2252dd46284274f5103dd0347