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