| commit | cf28ca3c739c7fd127aa70377704da494e4f4c83 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 13:56:04 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 13:56:04 2020 +0000 |
| tree | c0b93d439cb39b9eb973b3144b23658ed8f96137 | |
| parent | e4321e73593325c89fdf9b8b82ab12d190d1c5ce [diff] | |
| parent | 8e375eccc7a22c0ba69f0bb385469834180e805d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b13c90f3bb -s ours am: 8e375eccc7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12518879 Change-Id: Ic8ea1717b060381c468ae0c6d137c618edc2a8cd