| commit | 5cd5202cca20dde5dea677c206933baea35630ea | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Oct 05 16:38:26 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 05 16:38:26 2020 +0000 |
| tree | aec68baa34917b6025e4d0c825f5ec7b35f5cd7d | |
| parent | 3888e996f4d4a67e41a1e8a1a27453b3c11d1aa0 [diff] | |
| parent | 37a9ed4d891fab51fa7907ae409581b2c283284b [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 576055cbcb -s ours am: e7171c12fb -s ours am: 37a9ed4d89 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12763746 Change-Id: Ie5a9363dfb8ff739325f98966e372f4564d5c433