| commit | fd9c90f4dcdcf6bdf1119825ced6de0ee5e463d4 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Oct 05 15:23:07 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 05 15:23:07 2020 +0000 |
| tree | aec68baa34917b6025e4d0c825f5ec7b35f5cd7d | |
| parent | 3285bce8c2f21bd0099b3bbd34d63eca1890500d [diff] | |
| parent | e1c57f6a0e5a3c9601cc38fdf7f21b86931c3374 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a3d1d70981 -s ours am: 523d30f631 -s ours am: e1c57f6a0e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12762769 Change-Id: I2c21814bc9b2a169e3e77ac0668fc0e86ad48f79