| commit | e669aa4657908d5cd03606f0cd4bd3b29cf1338b | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 06:55:01 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 06:55:01 2020 +0000 |
| tree | 26da2b660044f205549652cbf2aa2abf47f06e3d | |
| parent | c612d8a43cff2adb8d7029cc46c76c399ae22ce9 [diff] | |
| parent | 25e69b7fdd85e85c529eeaa034a2d526699f53b3 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: bc080eb257 -s ours am: 29170e5f45 -s ours am: 25e69b7fdd -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12516984 Change-Id: If8b8ec5ad595d87e140ce9660d3cc81d11e6c5bb