commit | 37280d5876712c9d3c8fd0a8bb3271e1d86d4a37 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Oct 07 15:38:29 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 07 15:38:29 2020 +0000 |
tree | ee94849c5e7d84619c3ee2b84c091cc3dc0302be | |
parent | 697b8ced2fc9bbc5ce8cc88047e4fb85017b4e74 [diff] | |
parent | 42fbf5a0da42c32325aef385b138d812667f0644 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 0609e2b01d -s ours am: 5e3cda6760 -s ours am: 42fbf5a0da -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12780797 Change-Id: I98029d010847c18939d2673261610b35deca9eb3