| commit | 5eaafa9d346a87505e80f97c7b090f9581bdd51f | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Oct 06 01:26:14 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 06 01:26:14 2020 +0000 |
| tree | d3f76e3a789dbf8be6e1dba3be3b3a2740b61026 | |
| parent | 1bfe97aab44348be1059cf7092ed1eac94230f4a [diff] | |
| parent | 66bd3dc20fd0a0e68e781f3063cafc204fd56a93 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 2cae888d17 -s ours am: 66bd3dc20f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12764397 Change-Id: Iedd48d0a41b50824d9cbfe95a075cbe869eb2b28