commit | 9911b7d416dcaafab2e78e122bca8b5cba095ede | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Oct 09 19:02:12 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 09 19:02:12 2020 +0000 |
tree | a383d3f18212756ca4871073d0ca4dda6cd29092 | |
parent | d67a33d6e19278b36c83f54587e33926f2801f6e [diff] | |
parent | ee8b77f261ffedfadb68842132dc81b7d73c3005 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 0f7bf3b718 -s ours am: 18ec4996af -s ours am: ee8b77f261 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12803306 Change-Id: I8e2977e647ab35f030c34e7bd75eb7d89dd5613a