commit | e6218fa7d977574d7db65a84d0b3e0399979f214 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 05:23:02 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 05:23:02 2020 +0000 |
tree | e93bd2e9997638fc87685f6433e00b5f5f410dce | |
parent | fe81c3d35ba0f88ec4733df8ca75eb31b998ea4f [diff] | |
parent | 296eca58b80c9582a8a30f2c97dcdb073374f76d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: fb5578f1b5 -s ours am: 821265b102 -s ours am: 296eca58b8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515618 Change-Id: Iecb08d5fcc0faf6076586a5d3b47d7b583d62378