commit | 1a19c2ec65385dbecb502e19544e6f2b5f302025 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Oct 05 14:22:48 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 05 14:22:48 2020 +0000 |
tree | f3b5623a68b9450d1f264c744ac833be6ff1af52 | |
parent | fa97d47b0162c326b0ae286e2910abdfebce5864 [diff] | |
parent | 77a9e8ad331f638c9df4e64cbb701134e522db1f [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 7e335c887e -s ours am: 9aee32dba9 -s ours am: 3abb351221 -s ours am: 77a9e8ad33 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12759559 Change-Id: Ic09a271826e571cf2ad1a0215bf30543579bfbec